diff --git a/base/src/org/compiere/util/Ini.java b/base/src/org/compiere/util/Ini.java
index 48be8bf370..8843f9351a 100644
--- a/base/src/org/compiere/util/Ini.java
+++ b/base/src/org/compiere/util/Ini.java
@@ -41,6 +41,8 @@ import javax.jnlp.FileContents;
 import javax.jnlp.PersistenceService;
 import javax.jnlp.ServiceManager;
 import javax.jnlp.UnavailableServiceException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import org.adempiere.plaf.AdempiereLookAndFeel;
 import org.adempiere.plaf.AdempiereThemeInnova;
@@ -748,7 +750,17 @@ public final class Ini implements Serializable
 		String env = System.getProperty (ENV_PREFIX + ADEMPIERE_HOME);
 		if (env == null)
 			env = System.getProperty (ADEMPIERE_HOME);
-		if (env == null)	//	Fallback
+		if (env == null) {
+			InitialContext context;
+			try {
+				context = new InitialContext();
+				env = (String) context.lookup("java:comp/env/"+ADEMPIERE_HOME);
+			} catch (NamingException e) {
+				log.fine( "Not found 'java:comp/env/"+ADEMPIERE_HOME+"' in Initial Context. " +e.getMessage());
+			}
+			
+		}
+		if (env == null || "".equals(env) )	//	Fallback
 			env = File.separator + "Adempiere";
 		return env;
 	}   //  getAdempiereHome
diff --git a/zkwebui/WEB-INF/web.xml b/zkwebui/WEB-INF/web.xml
index 98bc56f5e5..3ee76086a8 100644
--- a/zkwebui/WEB-INF/web.xml
+++ b/zkwebui/WEB-INF/web.xml
@@ -158,6 +158,11 @@
 	</mime-mapping>
 	<welcome-file-list>
 		<welcome-file>index.zul</welcome-file>
-		
 	</welcome-file-list>
+	
+	<!--env-entry>
+		<env-entry-name>ADEMPIERE_HOME</env-entry-name>
+		<env-entry-type>java.lang.String</env-entry-type>
+		<env-entry-value>/opt/adempiere/</env-entry-value>
+	</env-entry-->
 </web-app>