7 files changed, 11 insertions, 10 deletions
diff --git a/data/help/header.txt b/data/help/header.txt
index b5cfa5713..46eaa73dc 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -4,6 +4,6 @@
 
                        <<##2Version:##6%VER%>>
 
-##2    <<Website: @@http://manaplus.evolonline.org/|http://manaplus.evolonline.org/@@>>
+##2    <<Website: @@http://manaplus.org/|http://manaplus.org/@@>>
 
 
diff --git a/data/help/tips/10.txt b/data/help/tips/10.txt
index 88c25f907..fdea2e3d1 100644
--- a/data/help/tips/10.txt
+++ b/data/help/tips/10.txt
@@ -1,2 +1,2 @@
 <<If client working very slow, you can improve speed
-by reading this: @@http://manaplus.evolonline.org/slowpc|http://manaplus.evolonline.org/slowpc@@>>
+by reading this: @@http://manaplus.org/slowpc|http://manaplus.org/slowpc@@>>
diff --git a/data/help/tips/16.txt b/data/help/tips/16.txt
index 95d891dbd..0e8c9f681 100644
--- a/data/help/tips/16.txt
+++ b/data/help/tips/16.txt
@@ -1,2 +1,3 @@
 <<Look this page for help and downloads:>>
-@@http://manaplus.evolonline.org/|http://manaplus.evolonline.org/@@
+
+@@http://manaplus.org/|http://manaplus.org/@@
diff --git a/data/help/tips/8.txt b/data/help/tips/8.txt
index bd47560cb..9caff898a 100644
--- a/data/help/tips/8.txt
+++ b/data/help/tips/8.txt
@@ -1,2 +1,2 @@
 <<About yellow bar you can read here:
-@@http://manaplus.evolonline.org/yellowbar|http://manaplus.evolonline.org/yellowbar@@>>
+@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@>>
diff --git a/src/defaults.cpp b/src/defaults.cpp
index cb8d553ac..f2229492d 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -377,7 +377,7 @@ DefaultsData* getBrandingDefaults()
     AddDEF("defaultPort", DEFAULT_PORT);
     AddDEF("defaultServerType", "tmwathena");
     AddDEF("onlineServerList",
-           "http://manaplus.evolonline.org/serverlist.xml");
+           "http://manaplus.org/serverlist.xml");
     AddDEF("onlineServerFile", "serverlistplus.xml");
     AddDEF("appShort", "mana");
     AddDEF("defaultUpdateHost", "");
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 9294742c0..d8c681392 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -556,10 +556,10 @@ void ServerDialog::downloadServerList()
     if (listFile.empty())
         listFile = config.getStringValue("onlineServerList");
 
-    // Fall back to manaplus.evolonline.org when neither branding
+    // Fall back to manaplus.org when neither branding
     // nor config set it
     if (listFile.empty())
-        listFile = "http://manaplus.evolonline.org/serverlist.xml";
+        listFile = "http://manaplus.org/serverlist.xml";
 
     if (mDownload)
     {
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index a29514994..e41700dd3 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -402,8 +402,8 @@ void UpdaterWindow::loadPatch()
                 "manaplus/download/manaplus-win32.exe|download here@@]", true);
 #else
             mBrowserBox->addRow("", true);
-            mBrowserBox->addRow("  ##1@@http://manaplus.evolonline.org/|"
-                "http://manaplus.evolonline.org/@@", true);
+            mBrowserBox->addRow("  ##1@@http://manaplus.org/|"
+                "http://manaplus.org/@@", true);
             mBrowserBox->addRow("##1You can download it from", true);
             mBrowserBox->addRow("##1ManaPlus updated.", true);
 #endif
@@ -504,7 +504,7 @@ void UpdaterWindow::download()
     if (mDownloadStatus == UPDATE_PATCH)
     {
         mDownload = new Net::Download(this,
-            "http://manaplus.evolonline.org/update/" + mCurrentFile,
+            "http://manaplus.org/update/" + mCurrentFile,
             updateProgress, true);
     }
     else