diff --git a/client/src/org/compiere/install/Translation.java b/client/src/org/compiere/install/Translation.java
index e6897c443b..69db51c542 100644
--- a/client/src/org/compiere/install/Translation.java
+++ b/client/src/org/compiere/install/Translation.java
@@ -48,7 +48,7 @@ public class Translation
 	}	//	Translation
 	
 	/**	DTD						*/
-	public static final String DTD = "<!DOCTYPE adempiereTrl PUBLIC \"-//ComPiere, Inc.//DTD Adempiere Translation 1.0//EN\" \"http://www.adempiere.org/dtd/adempiereTrl.dtd\">";
+	public static final String DTD = "<!DOCTYPE adempiereTrl PUBLIC \"-//ComPiere, Inc.//DTD Adempiere Translation 1.0//EN\" \"http://www.adempiere.com/dtd/adempiereTrl.dtd\">";
 	/**	XML Element Tag			*/
 	public static final String	XML_TAG = "adempiereTrl";
 	public static final String	XML_TAG2 = "compiereTrl";
diff --git a/install/src/org/compiere/install/Setup_Help.java b/install/src/org/compiere/install/Setup_Help.java
index 25811c4651..3c590f328f 100644
--- a/install/src/org/compiere/install/Setup_Help.java
+++ b/install/src/org/compiere/install/Setup_Help.java
@@ -121,7 +121,7 @@ public class Setup_Help extends JDialog implements ActionListener
 	{
 		try
 		{
-			editorPane.setPage("http://www.adempiere.org/help/serverSetup.html");
+			editorPane.setPage("http://www.adempiere.com/wiki/index.php/ServerSetupHelp");
 		}
 		catch (IOException ex)
 		{
diff --git a/looks/src/org/adempiere/plaf/PLAFEditor.java b/looks/src/org/adempiere/plaf/PLAFEditor.java
index 08eda25409..6f19668e25 100644
--- a/looks/src/org/adempiere/plaf/PLAFEditor.java
+++ b/looks/src/org/adempiere/plaf/PLAFEditor.java
@@ -442,7 +442,7 @@ public class PLAFEditor extends JDialog
 		}
 		else if (e.getSource() == bHelp)
 		{
-			new MiniBrowser("http://www.adempiere.org/looks/help.html");
+			new MiniBrowser("http://www.adempiere.com/wiki/index.php/LooksHelp");
 		}
 
 		//  Look & Feel changed