diff --git a/attributes/default.rb b/attributes/default.rb
index 77ed8f97..14b68f64 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -42,6 +42,8 @@
   default['java']['install_flavor'] = "openjdk"
 end
 
+default['java']['app_home'] = ''
+
 case node['java']['install_flavor']
 when 'ibm', 'ibm_tar'
   default['java']['ibm']['url'] = nil
diff --git a/recipes/oracle.rb b/recipes/oracle.rb
index 57ffcfd2..c03e539a 100644
--- a/recipes/oracle.rb
+++ b/recipes/oracle.rb
@@ -26,6 +26,12 @@
   end
 end
 
+app_home = node['java']["java_home"]
+
+if !node['java']['app_home'].nil? and !node['java']['app_home'].empty?
+  app_home = node['java']["app_home"]
+end
+
 java_home = node['java']["java_home"]
 arch = node['java']['arch']
 
@@ -54,7 +60,7 @@
   url tarball_url
   default node['java']['set_default']
   checksum tarball_checksum
-  app_home java_home
+  app_home app_home
   bin_cmds bin_cmds
   alternatives_priority node['java']['alternatives_priority']
   retries node['java']['ark_retries']
diff --git a/recipes/oracle_i386.rb b/recipes/oracle_i386.rb
index c3319b9f..ad1ef3e7 100644
--- a/recipes/oracle_i386.rb
+++ b/recipes/oracle_i386.rb
@@ -26,6 +26,12 @@
   end
 end
 
+app_home = node['java']["java_home"]
+
+if !node['java']['app_home'].nil? and !node['java']['app_home'].empty?
+  app_home = node['java']["app_home"]
+end
+
 java_home = node['java']["java_home"]
 
 case node['java']['jdk_version'].to_s
@@ -54,7 +60,7 @@
   url tarball_url
   default node['java']['set_default']
   checksum tarball_checksum
-  app_home java_home
+  app_home app_home
   bin_cmds bin_cmds
   retries node['java']['ark_retries']
   retry_delay node['java']['ark_retries']