diff --git a/base/src/org/compiere/db/ServerConnection.java b/base/src/org/compiere/db/ServerConnection.java
index 749758eeca..a1a46af732 100644
--- a/base/src/org/compiere/db/ServerConnection.java
+++ b/base/src/org/compiere/db/ServerConnection.java
@@ -257,7 +257,7 @@ public class ServerConnection implements Connection
 	    throw new java.lang.UnsupportedOperationException ("Method setTypeMap() not yet implemented.");
 	}
 
-	/* Java 6 support - teo_sarca BF [ 1806700 ] *
+	/* Java 6 support - teo_sarca BF [ 1806700 ] */
 	public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
 	    throw new java.lang.UnsupportedOperationException ("Method not yet implemented.");
 	}
diff --git a/base/src/org/compiere/util/CCallableStatement.java b/base/src/org/compiere/util/CCallableStatement.java
index d91bd96603..65a05ad1d0 100644
--- a/base/src/org/compiere/util/CCallableStatement.java
+++ b/base/src/org/compiere/util/CCallableStatement.java
@@ -1462,7 +1462,7 @@ public class CCallableStatement extends CPreparedStatement implements CallableSt
 
     
 
-	/* Java 6 support - teo_sarca BF [ 1806700 ] *
+	/* Java 6 support - teo_sarca BF [ 1806700 ] */
 	public Reader getCharacterStream(int parameterIndex) throws SQLException {
         if (p_stmt != null)
         {
diff --git a/base/src/org/compiere/util/CPreparedStatement.java b/base/src/org/compiere/util/CPreparedStatement.java
index 94d1b4eeda..791585e87b 100644
--- a/base/src/org/compiere/util/CPreparedStatement.java
+++ b/base/src/org/compiere/util/CPreparedStatement.java
@@ -884,7 +884,7 @@ public class CPreparedStatement extends CStatement implements PreparedStatement
          
         //uncomment the following methods to compile using jdk 6
         //vpj-cd add support java 6    
-        /*
+        
         public void setBinaryStream(int parameterIndex, java.io.InputStream x, 
 			 long length) throws SQLException
         {        
@@ -981,7 +981,7 @@ public class CPreparedStatement extends CStatement implements PreparedStatement
        }
 
        public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException{}
-       */
+       
 
 }	//	CPreparedStatement
 
diff --git a/serverRoot/src/web/adempiere.jnlp b/serverRoot/src/web/adempiere.jnlp
index 478ba21401..1e4b3197a0 100644
--- a/serverRoot/src/web/adempiere.jnlp
+++ b/serverRoot/src/web/adempiere.jnlp
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jnlp spec = "1.5+" version = "3.5.2a" 
+<jnlp spec = "1.6+" version = "3.5.2a" 
 	codebase = "$$context/adempiereHome" 
 	href = "$$context/adempiere.jnlp">  
 	<information>
@@ -21,7 +21,7 @@
 		<all-permissions/>  
 	</security>
 	<resources>
-		<j2se version = "1.5+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
+		<j2se version = "1.6+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
 		<jar href = "Adempiere.jar" main = "true" download = "eager"/>
 		<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
 		<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>
diff --git a/utils/adempiereDirectTemplate.jnlp b/utils/adempiereDirectTemplate.jnlp
index 5b69b09db0..ebb139f79f 100644
--- a/utils/adempiereDirectTemplate.jnlp
+++ b/utils/adempiereDirectTemplate.jnlp
@@ -1,5 +1,5 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<jnlp spec = "1.5+" version = "3.5.2a" 
+<jnlp spec = "1.6+" version = "3.5.2a" 
 	codebase = "http://@ADEMPIERE_APPS_SERVER@:@ADEMPIERE_WEB_PORT@/admin/adempiereHome" 
 	href = "http://@ADEMPIERE_APPS_SERVER@:@ADEMPIERE_WEB_PORT@/admin/adempiereHome/adempiereDirect.jnlp">  
 	<information>
@@ -20,7 +20,7 @@
 		<all-permissions/>  
 	</security>
 	<resources>
-		<j2se version = "1.5+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
+		<j2se version = "1.6+" href = "http://java.sun.com/products/autodl/j2se" initial-heap-size = "32m" max-heap-size = "512m"/>
 		<jar href = "Adempiere.jar" main = "true" download = "eager"/>
 		<jar href = "AdempiereCLib.jar" main = "false" download = "eager"/>
 		<jar href = "CompiereJasperReqs.jar" main = "false" download = "eager"/>