diff --git a/README b/README
index 64ae5d832..0b26fdc11 100644
--- a/README
+++ b/README
@@ -13,9 +13,9 @@ The interface is built with Qt. FreeCAD runs exactly the same way on Windows, Ma
 Linux platforms.
 
 Home page:                             http://www.freecadweb.org
-Documentation wiki:                    http://www.freecadweb.org/wiki
-Forum:                                 http://sourceforge.net/apps/phpbb/free-cad/
-Bug tracker:                           http://www.freecadweb.org/tracker
+Documentation wiki:                    http://www.freecadweb.org/wiki/
+Forum:                                 http://www.freecadweb.org/forum/
+Bug tracker:                           http://www.freecadweb.org/tracker/
 Git repository:                        http://sourceforge.net/p/free-cad/code/ci/master/tree/
 
 Installing
diff --git a/src/App/Application.cpp b/src/App/Application.cpp
index bcce61567..9665c30ef 100644
--- a/src/App/Application.cpp
+++ b/src/App/Application.cpp
@@ -1363,7 +1363,7 @@ void Application::LoadParameters(void)
 
 #if defined(_MSC_VER)
 // fix weird error while linking boost (all versions of VC)
-// VS2010: https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=1886&p=12553&hilit=boost%3A%3Afilesystem%3A%3Aget#p12553
+// VS2010: http://www.freecadweb.org/forum/viewtopic.php?f=4&t=1886&p=12553&hilit=boost%3A%3Afilesystem%3A%3Aget#p12553
 namespace boost { namespace program_options { std::string arg="arg"; } }
 #if (defined (BOOST_VERSION) && (BOOST_VERSION >= 104100))
 namespace boost { namespace program_options {
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
index 5ba4beddd..b9bac32da 100644
--- a/src/Gui/CommandStd.cpp
+++ b/src/Gui/CommandStd.cpp
@@ -543,7 +543,7 @@ StdCmdFreeCADForum::StdCmdFreeCADForum()
 
 void StdCmdFreeCADForum::activated(int iMsg)
 {
-    OpenURLInBrowser("http://sourceforge.net/apps/phpbb/free-cad");
+    OpenURLInBrowser("http://www.freecadweb.org/forum/");
 }
 
 //===========================================================================
diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp
index 3e71dae7d..b9044897f 100644
--- a/src/Mod/Part/App/PartFeatures.cpp
+++ b/src/Mod/Part/App/PartFeatures.cpp
@@ -356,7 +356,7 @@ App::DocumentObjectExecReturn *Sweep::execute(void)
                 return new App::DocumentObjectExecReturn("Linked shape is invalid.");
             // There is a weird behaviour of BRepOffsetAPI_MakePipeShell when trying to add the wire as is.
             // If we re-create the wire then everything works fine.
-            // https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=10&t=2673&sid=fbcd2ff4589f0b2f79ed899b0b990648#p20268
+            // http://www.freecadweb.org/forum/viewtopic.php?f=10&t=2673&sid=fbcd2ff4589f0b2f79ed899b0b990648#p20268
             if (shape.ShapeType() == TopAbs_FACE) {
                 TopoDS_Wire faceouterWire = ShapeAnalysis::OuterWire(TopoDS::Face(shape));
                 profiles.Append(faceouterWire);
diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp
index bf787cd30..1fffa834a 100644
--- a/src/Mod/PartDesign/App/FeatureDraft.cpp
+++ b/src/Mod/PartDesign/App/FeatureDraft.cpp
@@ -266,7 +266,7 @@ App::DocumentObjectExecReturn *Draft::execute(void)
                 if (!mkDraft.AddDone()) {
                     // Note: the function ProblematicShape returns the face on which the error occurred
                     // Note: mkDraft.Remove() stumbles on a bug in Draft_Modification::Remove() and is
-                    //       therefore unusable. See https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=10&t=3209&start=10#p25341
+                    //       therefore unusable. See http://www.freecadweb.org/forum/viewtopic.php?f=10&t=3209&start=10#p25341
                     //       The only solution is to discard mkDraft and start over without the current face
                     // mkDraft.Remove(face);
                     Base::Console().Error("Adding face failed on %s. Omitted\n", it->c_str());
diff --git a/src/Mod/Sketcher/App/freegcs/GCS.cpp b/src/Mod/Sketcher/App/freegcs/GCS.cpp
index ccea5d11d..97f07b07a 100644
--- a/src/Mod/Sketcher/App/freegcs/GCS.cpp
+++ b/src/Mod/Sketcher/App/freegcs/GCS.cpp
@@ -30,7 +30,7 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/connected_components.hpp>
 
-// http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=3&t=4651&start=40
+// http://www.freecadweb.org/forum/viewtopic.php?f=3&t=4651&start=40
 namespace Eigen {
 
 typedef Matrix<double,-1,-1,0,-1,-1> MatrixdType;
diff --git a/src/Mod/TemplatePyMod/MengerSponge.py b/src/Mod/TemplatePyMod/MengerSponge.py
index 12741bedd..0f5bb0ed6 100644
--- a/src/Mod/TemplatePyMod/MengerSponge.py
+++ b/src/Mod/TemplatePyMod/MengerSponge.py
@@ -2,7 +2,7 @@
 # (c) 2012 Werner Mayer LGPL
 
 # The script is based on the work of daxmick at
-# https://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=3&t=2307
+# http://www.freecadweb.org/forum/viewtopic.php?f=3&t=2307
 
 import threading
 import Mesh, MeshGui