diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c33314..7343cef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+##2015-06-22 - Supported Release 4.7.0
+###Summary
+
+Adds Solaris 12 support along with improved Puppet 4 support. There are significant test improvements, and some minor fixes.
+
+####Features
+- Add support for Solaris 12
+
+####Bugfixes
+- Fix for AIO Puppet 4
+- Fix time for ruby 1.8.7
+- Specify rspec-puppet version
+- range() fix for typeerror and missing functionality
+- Fix pw_hash() on JRuby < 1.7.17
+- fqdn_rand_string: fix argument error message
+- catch and rescue from looking up non-existent facts
+- Use puppet_install_helper, for Puppet 4
+
+####Improvements
+- Enforce support for Puppet 4 testing
+- fqdn_rotate/fqdn_rand_string acceptance tests and implementation
+- Simplify mac address regex
+- validate_integer, validate_numeric: explicitely reject hashes in arrays
+- Readme edits
+- Remove all the pops stuff for rspec-puppet
+- Sync via modulesync
+- Add validate_slength optional 3rd arg
+- Move tests directory to examples directory
+
 ##2015-04-14 - Supported Release 4.6.0
 ###Summary
 
diff --git a/tests/file_line.pp b/examples/file_line.pp
similarity index 100%
rename from tests/file_line.pp
rename to examples/file_line.pp
diff --git a/tests/has_interface_with.pp b/examples/has_interface_with.pp
similarity index 100%
rename from tests/has_interface_with.pp
rename to examples/has_interface_with.pp
diff --git a/tests/has_ip_address.pp b/examples/has_ip_address.pp
similarity index 100%
rename from tests/has_ip_address.pp
rename to examples/has_ip_address.pp
diff --git a/tests/has_ip_network.pp b/examples/has_ip_network.pp
similarity index 100%
rename from tests/has_ip_network.pp
rename to examples/has_ip_network.pp
diff --git a/tests/init.pp b/examples/init.pp
similarity index 100%
rename from tests/init.pp
rename to examples/init.pp
diff --git a/metadata.json b/metadata.json
index 3254497..5c20ade 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-stdlib",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "author": "puppetlabs",
   "summary": "Standard library of resources for Puppet modules.",
   "license": "Apache-2.0",