diff --git a/org.adempiere.base/src/org/compiere/Adempiere.java b/org.adempiere.base/src/org/compiere/Adempiere.java
index 7c6d799593..d074d8abae 100644
--- a/org.adempiere.base/src/org/compiere/Adempiere.java
+++ b/org.adempiere.base/src/org/compiere/Adempiere.java
@@ -45,6 +45,9 @@ import org.compiere.util.Login;
 import org.compiere.util.SecureEngine;
 import org.compiere.util.SecureInterface;
 import org.compiere.util.Util;
+import org.eclipse.core.runtime.IProduct;
+import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.Bundle;
 
 /**
  *  Adempiere Control Class
@@ -139,9 +142,21 @@ public final class Adempiere
 	 */
 	public static String getVersion()
 	{
-		return MAIN_VERSION + " @ " + DATE_VERSION;
+		IProduct product = Platform.getProduct();
+		if (product != null) {
+			Bundle bundle = product.getDefiningBundle();
+			if (bundle != null) {
+				return bundle.getVersion().toString();
+			}
+		}
+		return "Unknown";
 	}   //  getVersion
 
+	public static String getDatabaseVersion() 
+	{
+		return DB.getSQLValueString(null, "select lastmigrationscriptapplied from ad_system");
+	}
+	
 	/**
 	 *	Short Summary (Windows)
 	 *  @return summary
@@ -183,8 +198,8 @@ public final class Adempiere
 		s_ImplementationVersion = adempierePackage.getImplementationVersion();
 		if (s_ImplementationVendor == null)
 		{
-			s_ImplementationVendor = "Supported by ADempiere community";
-			s_ImplementationVersion = "ADempiere";
+			s_ImplementationVendor = "Supported by iDempiere community";
+			s_ImplementationVersion = "iDempiere";
 		}
 	}	//	setPackageInfo
 
@@ -576,5 +591,4 @@ public final class Adempiere
 	public static URL getResource(String name) {
 		return Core.getResourceFinder().getResource(name);
 	}
-
 }	//	Adempiere
diff --git a/org.adempiere.ui.zk/theme/default/version-info.zul b/org.adempiere.ui.zk/theme/default/version-info.zul
index 4b9efbf2a5..1a7d227f7c 100644
--- a/org.adempiere.ui.zk/theme/default/version-info.zul
+++ b/org.adempiere.ui.zk/theme/default/version-info.zul
@@ -6,11 +6,9 @@ Copyright (C) 2009 Idalica Corporation
 <zk>
 <zscript>
 	import org.compiere.Adempiere;
-	var mainVersion = Adempiere.MAIN_VERSION;
-	var dateVersion = Adempiere.DATE_VERSION;
-	var dbVersion = Adempiere.DB_VERSION;
+	var mainVersion = Adempiere.getVersion();
+	var dbVersion = Adempiere.getDatabaseVersion();
 	var vendor = Adempiere.getImplementationVendor();
-	var vendorVersion = Adempiere.getImplementationVersion();
 	var jvm = Adempiere.getJavaInfo();
 	var os = Adempiere.getOSInfo();
 </zscript>
@@ -30,15 +28,10 @@ Copyright (C) 2009 Idalica Corporation
 <div class="versionInfoBox">
 	<table border="0">
 		<tr>
-			<td align="right">Main Version</td>
+			<td align="right">Version</td>
 			<td>:</td>
 			<td aligh="left">${mainVersion}</td>
 		</tr>
-		<tr>
-			<td align="right">Date Version</td>
-			<td>:</td>
-			<td aligh="left">${dateVersion}</td>
-		</tr>
 		<tr>
 			<td align="right">Database Version</td>
 			<td>:</td>
@@ -49,11 +42,6 @@ Copyright (C) 2009 Idalica Corporation
 			<td>:</td>
 			<td aligh="left">${vendor}</td>
 		</tr>
-		<tr>
-			<td align="right">Vendor Version</td>
-			<td>:</td>
-			<td aligh="left">${vendorVersion}</td>
-		</tr>
 		<tr>
 			<td align="right">JVM</td>
 			<td>:</td>