diff --git a/.gitignore b/.gitignore
index 73879ef5..2fe00635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ pkg/
 .DS_Store
 metadata.json
 spec/fixtures
+*.idea
+*.swp
+*.tmp
\ No newline at end of file
diff --git a/manifests/params.pp b/manifests/params.pp
index 09981dbb..520e0c49 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -24,6 +24,10 @@
           $jdk_package = 'java'
           $jre_package = 'java'
         }
+        'Amazon': {
+          $jdk_package = 'java-1.7.0-openjdk-devel'
+          $jre_package = 'java-1.7.0-openjdk'
+        }
       }
     }
     'Debian': {
diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb
index 5e802c92..96ef14e2 100644
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -28,4 +28,15 @@
     it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
   end
 
+  context 'select openjdk for Amazon Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+  end
+
+  context 'select passed value for Amazon Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
 end