diff --git a/CHANGELOG b/CHANGELOG
index 85e8bcb..78dd4df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2012-11-15 Scott Schneider <sschneider@puppetlabs.com> - 0.1.6
+* Add Solaris support
+
 2011-06-16 Jeff McCune <jeff@puppetlabs.com> - 0.1.5
 * Add Debian based distro (Lucid) support
 
diff --git a/Modulefile b/Modulefile
index f3cb899..c56ec45 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-java'
-version '0.1.5'
+version '0.1.6'
 source 'git://github.com/puppetlabs/puppetlabs-java'
 author 'puppetlabs'
 license 'Apache'
diff --git a/manifests/init.pp b/manifests/init.pp
index be8ff69..c9ecdfc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -64,6 +64,22 @@ class java(
 
     }
 
+    'Solaris': {
+
+      $distribution_solaris = $distribution ? {
+        jdk => 'developer/java/jdk-7',
+        jre => 'runtime/java/jre-7',
+      }
+
+      class { 'java::package_solaris':
+        version      => $version,
+        distribution => $distribution_solaris,
+        require      => Anchor['java::begin'],
+        before       => Anchor['java::end'],
+      }
+
+    }
+
     default: {
       fail("osfamily ${::osfamily} is not supported")
     }
diff --git a/manifests/package_solaris.pp b/manifests/package_solaris.pp
new file mode 100644
index 0000000..a9752c5
--- /dev/null
+++ b/manifests/package_solaris.pp
@@ -0,0 +1,27 @@
+# Class: java::package_solaris
+#
+#   Implementation class of the Java package
+#   for Solaris based systems.
+#
+#   This class is not meant to be used by the end user
+#   of the module.  It is an implementation class
+#   of the composite Class[java]
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class java::package_solaris(
+  $version,
+  $distribution
+) {
+
+  package { 'java':
+    ensure => $version,
+    name   => $distribution,
+  }
+}