diff --git a/android/build_androidtc_armv6.sh b/android/build_androidtc_armv6.sh
index a53e3dc8c67..02a2167cd50 100755
--- a/android/build_androidtc_armv6.sh
+++ b/android/build_androidtc_armv6.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildClient#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient#
 #
 
 # Script to setup Android toolchain
diff --git a/android/build_boinc_arm.sh b/android/build_boinc_arm.sh
index 9e41cc7ac77..4f0017c8719 100755
--- a/android/build_boinc_arm.sh
+++ b/android/build_boinc_arm.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildClient#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient#
 #
 
 # Script to compile BOINC for Android
diff --git a/android/build_boinc_arm64.sh b/android/build_boinc_arm64.sh
index 9327e26be7f..ad18d2f080e 100755
--- a/android/build_boinc_arm64.sh
+++ b/android/build_boinc_arm64.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildClient#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient#
 #
 
 # Script to compile BOINC for Android
diff --git a/android/build_boinc_armv6.sh b/android/build_boinc_armv6.sh
index cf6b03d15c3..ccac80eecea 100755
--- a/android/build_boinc_armv6.sh
+++ b/android/build_boinc_armv6.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildClient#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient#
 #
 
 # Script to compile BOINC for Android
diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh
index 2613da7ed1b..0b206d4baf1 100755
--- a/android/build_boinc_x86.sh
+++ b/android/build_boinc_x86.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildClient#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient#
 #
 
 # Script to compile BOINC for Android
diff --git a/android/build_boinc_x86_64.sh b/android/build_boinc_x86_64.sh
index 529eb757d0a..a2583e77fbc 100755
--- a/android/build_boinc_x86_64.sh
+++ b/android/build_boinc_x86_64.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildClient#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient#
 #
 
 # Script to compile BOINC for Android
diff --git a/android/build_component.sh b/android/build_component.sh
index 733207a6196..845435c62c7 100755
--- a/android/build_component.sh
+++ b/android/build_component.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: https://boinc.berkeley.edu/trac/wiki/AndroidBuildClient
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient
 #
 
 # Script to compile BOINC selected component for Android
diff --git a/android/build_libraries_arm.sh b/android/build_libraries_arm.sh
index df2c845918b..0b1ec682547 100755
--- a/android/build_libraries_arm.sh
+++ b/android/build_libraries_arm.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildApp
 #
 
 # Script to compile various BOINC libraries for Android to be used
diff --git a/android/build_libraries_arm64.sh b/android/build_libraries_arm64.sh
index 362e2e9f20e..b05715da866 100755
--- a/android/build_libraries_arm64.sh
+++ b/android/build_libraries_arm64.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildApp
 #
 
 # Script to compile various BOINC libraries for Android to be used
diff --git a/android/build_libraries_armv6.sh b/android/build_libraries_armv6.sh
index bc8d1a780c0..7525b295d51 100755
--- a/android/build_libraries_armv6.sh
+++ b/android/build_libraries_armv6.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildApp
 #
 
 # Script to compile various BOINC libraries for Android to be used
diff --git a/android/build_libraries_x86.sh b/android/build_libraries_x86.sh
index 2ba05e8e385..9769a3b713d 100755
--- a/android/build_libraries_x86.sh
+++ b/android/build_libraries_x86.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildApp
 #
 
 # Script to compile various BOINC libraries for Android to be used
diff --git a/android/build_libraries_x86_64.sh b/android/build_libraries_x86_64.sh
index 063fd18e184..91b10bb79eb 100755
--- a/android/build_libraries_x86_64.sh
+++ b/android/build_libraries_x86_64.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: http://boinc.berkeley.edu/trac/wiki/AndroidBuildApp#
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildApp
 #
 
 # Script to compile various BOINC libraries for Android to be used
diff --git a/android/ci_build_vcpkg_apps.sh b/android/ci_build_vcpkg_apps.sh
index dbbb4ed5c10..9c259221930 100755
--- a/android/ci_build_vcpkg_apps.sh
+++ b/android/ci_build_vcpkg_apps.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: https://boinc.berkeley.edu/trac/wiki/AndroidBuildClient
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient
 #
 
 # Script to compile BOINC apps for Android
diff --git a/android/ci_build_vcpkg_client.sh b/android/ci_build_vcpkg_client.sh
index 63a4875c920..f7c5ab746c8 100755
--- a/android/ci_build_vcpkg_client.sh
+++ b/android/ci_build_vcpkg_client.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: https://boinc.berkeley.edu/trac/wiki/AndroidBuildClient
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient
 #
 
 # Script to compile everything BOINC needs for Android
diff --git a/android/ci_build_vcpkg_libraries.sh b/android/ci_build_vcpkg_libraries.sh
index 3ed1f11b8e2..7621d38792e 100755
--- a/android/ci_build_vcpkg_libraries.sh
+++ b/android/ci_build_vcpkg_libraries.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: https://boinc.berkeley.edu/trac/wiki/AndroidBuildClient
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient
 #
 
 # Script to compile BOINC libs for Android
diff --git a/android/ci_build_vcpkg_manager.sh b/android/ci_build_vcpkg_manager.sh
index 528ae868c61..565b8fe62d0 100755
--- a/android/ci_build_vcpkg_manager.sh
+++ b/android/ci_build_vcpkg_manager.sh
@@ -2,7 +2,7 @@
 set -e
 
 #
-# See: https://boinc.berkeley.edu/trac/wiki/AndroidBuildClient
+# See: https://github.com/BOINC/boinc/wiki/AndroidBuildClient
 #
 
 # Script to compile everything BOINC needs for Android
diff --git a/api/libboinc_api.pc.in b/api/libboinc_api.pc.in
index a986cca0d42..045cf1d434d 100644
--- a/api/libboinc_api.pc.in
+++ b/api/libboinc_api.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: boinc_api
 Description: BOINC API
 Version: @PACKAGE_VERSION@
-URL: https://boinc.berkeley.edu/trac/wiki/BasicApi
+URL: https://github.com/BOINC/boinc/wiki/BasicApi
 
 Cflags: -I${includedir}/boinc
 Cflags.private: @GLUT_CFLAGS@
diff --git a/api/libboinc_graphics2.pc.in b/api/libboinc_graphics2.pc.in
index e750bb8f9cb..78ea80d5547 100644
--- a/api/libboinc_graphics2.pc.in
+++ b/api/libboinc_graphics2.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: boinc_graphics2
 Description: BOINC graphics API
 Version: @PACKAGE_VERSION@
-URL: https://boinc.berkeley.edu/trac/wiki/GraphicsApps
+URL: https://github.com/BOINC/boinc/wiki/GraphicsApps
 
 Cflags: -I${includedir}/boinc
 Cflags.private: @GLUT_CFLAGS@
diff --git a/api/libboinc_opencl.pc.in b/api/libboinc_opencl.pc.in
index 5050acd700c..176327c3194 100644
--- a/api/libboinc_opencl.pc.in
+++ b/api/libboinc_opencl.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: boinc_opencl
 Description: BOINC OpenCL API
 Version: @PACKAGE_VERSION@
-URL: https://boinc.berkeley.edu/trac/wiki/OpenclApps
+URL: https://github.com/BOINC/boinc/wiki/OpenclApps
 
 Cflags: -I${includedir}/boinc
 Cflags.private: @GLUT_CFLAGS@
diff --git a/lib/submit_api.py b/lib/submit_api.py
index c0fdc80df82..4a3126de252 100644
--- a/lib/submit_api.py
+++ b/lib/submit_api.py
@@ -17,7 +17,7 @@
 
 
 # Python bindings of the remote job submission and file management APIs
-# See https://boinc.berkeley.edu/trac/wiki/RemoteJobs#Pythonbinding
+# See https://github.com/BOINC/boinc/wiki/RemoteJobs#Pythonbinding
 
 import urllib
 import urllib2
diff --git a/mac_build/BuildMacBOINC.sh b/mac_build/BuildMacBOINC.sh
index 6798f985b6c..7f490eda570 100644
--- a/mac_build/BuildMacBOINC.sh
+++ b/mac_build/BuildMacBOINC.sh
@@ -146,7 +146,7 @@ major=`echo $version | sed 's/\([0-9]*\)[.].*/\1/' `;
 
 if [ "$major" -lt "11" ]; then
     echo "ERROR: Building BOINC requires System 10.7 or later.  For details, see build instructions at"
-    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or https://boinc.berkeley.edu/trac/wiki/MacBuild"
+    echo "boinc/mac_build/HowToBuildBOINC_XCode.rtf or https://github.com/BOINC/boinc/wiki/MacBuild"
     return 1
 fi
 
diff --git a/mac_installer/CE-ReadMe.rtf b/mac_installer/CE-ReadMe.rtf
index b6177ad26f7..d5661753922 100644
--- a/mac_installer/CE-ReadMe.rtf
+++ b/mac_installer/CE-ReadMe.rtf
@@ -41,7 +41,7 @@ Note: on some versions of the Mac OS, you may not be able to exit the Charity En
 
 \b0 \cf0 Charity Engine Desktop for the Macintosh features strong security measures.  This additional security helps protect your computer data from potential theft or accidental or malicious damage by limiting Charity Engine projects' access to your  system and data.  \
 \
-For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/SandboxUser"}}{\fldrslt http://boinc.berkeley.edu/trac/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
+For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "https://github.com/BOINC/boinc/wiki/SandboxUser"}}{\fldrslt https://github.com/BOINC/boinc/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 
@@ -82,4 +82,4 @@ You can move (
 \b0 ) Charity Engine Desktop from your Macintosh, run the 
 \b Uninstall Charity Engine
 \b0  application which is included with the installer.\
-}
\ No newline at end of file
+}
diff --git a/mac_installer/GR-ReadMe.rtf b/mac_installer/GR-ReadMe.rtf
index 2502efa0b06..b74e0e28fa8 100644
--- a/mac_installer/GR-ReadMe.rtf
+++ b/mac_installer/GR-ReadMe.rtf
@@ -39,7 +39,7 @@ Note: on some versions of the Mac OS, you may not be able to exit the GridRepubl
 
 \b0 \cf0 GridRepublic Desktop for the Macintosh features strong security measures.  This additional security helps protect your computer data from potential theft or accidental or malicious damage by limiting GridRepublic projects' access to your  system and data.  \
 \
-For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/SandboxUser"}}{\fldrslt http://boinc.berkeley.edu/trac/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
+For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "https://github.com/BOINC/boinc/wiki/SandboxUser"}}{\fldrslt https://github.com/BOINC/boinc/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 
@@ -80,4 +80,4 @@ You can move (
 \b0 ) GridRepublic Desktop from your Macintosh, run the 
 \b Uninstall GridRepublic
 \b0  application which is included with the installer.\
-}
\ No newline at end of file
+}
diff --git a/mac_installer/PTP-ReadMe.rtf b/mac_installer/PTP-ReadMe.rtf
index d5b400b7b8e..46060715405 100644
--- a/mac_installer/PTP-ReadMe.rtf
+++ b/mac_installer/PTP-ReadMe.rtf
@@ -39,7 +39,7 @@ Note: on some versions of the Mac OS, you may not be able to exit the Progress T
 
 \b0 \cf0 ProgressThruProcessors Desktop or BOINC for the Macintosh features strong security measures. This additional security helps protect your computer data from potential theft or accidental or malicious damage by limiting Progress Thru Processors projects' access to your  system and data.  \
 \
-For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/SandboxUser"}}{\fldrslt http://boinc.berkeley.edu/trac/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
+For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "https://github.com/BOINC/boinc/wiki/SandboxUser"}}{\fldrslt https://github.com/BOINC/boinc/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 
@@ -79,4 +79,4 @@ You can move (
 \b0 ) ProgressThruProcessors Desktop from your Macintosh, run the 
 \b Uninstall Progress Thru Processors
 \b0  application which is included with the installer.\
-}
\ No newline at end of file
+}
diff --git a/mac_installer/wcgrid-ReadMe.rtf b/mac_installer/wcgrid-ReadMe.rtf
index 0adb58ce709..a4c3c3a0513 100644
--- a/mac_installer/wcgrid-ReadMe.rtf
+++ b/mac_installer/wcgrid-ReadMe.rtf
@@ -68,7 +68,7 @@ Note: on some versions of the Mac OS, you may not be able to exit the World Comm
 \fs24 help protect your computer data from potential theft or accidental or malicious damage by limiting World Community Grid\'92s access to your system and data.  \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 \cf0 \
-For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/SandboxUser"}}{\fldrslt http://boinc.berkeley.edu/trac/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
+For more information or technical details of the implementation, please see {\field{\*\fldinst{HYPERLINK "https://github.com/BOINC/boinc/wiki/SandboxUser"}}{\fldrslt https://github.com/BOINC/boinc/wiki/SandboxUser}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
@@ -108,4 +108,4 @@ You can move (
 \f1\b0 ) World Community Grid from your Macintosh, run the 
 \f0\b Uninstall World Community Grid
 \f1\b0  application which is included with the installer in the extras folder.\
-}
\ No newline at end of file
+}
diff --git a/samples/nvcuda/cuda.cpp b/samples/nvcuda/cuda.cpp
index d6ae8a5c222..abcc717f35d 100644
--- a/samples/nvcuda/cuda.cpp
+++ b/samples/nvcuda/cuda.cpp
@@ -29,7 +29,7 @@
 // -early_exit: exit(10) after 30 chars
 // -early_crash: crash after 30 chars
 //
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
+// See https://github.com/BOINC/boinc/wiki/GPUApp
 // Contributor: Tuan Le (tuanle86@berkeley.edu)
 //
 // NOTE: As currently written, this sample is of limited usefulness, as it
diff --git a/samples/nvcuda/cuda.h b/samples/nvcuda/cuda.h
index 8bd60c75814..0a96c4275ea 100644
--- a/samples/nvcuda/cuda.h
+++ b/samples/nvcuda/cuda.h
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 //
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
+// See https://github.com/BOINC/boinc/wiki/GPUApp
 // Contributor: Tuan Le (tuanle86@berkeley.edu)
 
 #ifndef CUDA_H_
diff --git a/samples/nvcuda/cuda_config.h b/samples/nvcuda/cuda_config.h
index 763e1b9b78a..5a05e087e82 100644
--- a/samples/nvcuda/cuda_config.h
+++ b/samples/nvcuda/cuda_config.h
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 //
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues
+// See https://github.com/BOINC/boinc/wiki/GPUApp
 // Contributor: Tuan Le (tuanle86@berkeley.edu)
 
 #ifndef CUDA_CONFIG_H_
@@ -48,4 +48,4 @@ inline void __cudaSafeCall( int err, const char *file, const int line )
 #define SAFECALL(err) __cudaSafeCall(err, __FILE__, __LINE__)
 #define CUDACHECK {cudaError_t error = cudaGetLastError(); if(error != 0){fprintf(stderr, "Error code %d: %s file %s line %i.\n",error,cudaGetErrorString(error),__FILE__,__LINE__);}}
 
-#endif  /* #ifndef CUDA_CONFIG_H_ */
\ No newline at end of file
+#endif  /* #ifndef CUDA_CONFIG_H_ */
diff --git a/samples/openclapp/openclapp.cpp b/samples/openclapp/openclapp.cpp
index 7c168ed8647..afe6e51ab58 100644
--- a/samples/openclapp/openclapp.cpp
+++ b/samples/openclapp/openclapp.cpp
@@ -35,7 +35,7 @@
 // -early_exit: exit(10) after 30 iterations
 // -early_crash: crash after 30 iterations
 //
-// See http://boinc.berkeley.edu/trac/wiki/GPUApp for any compiling issues.
+// See https://github.com/BOINC/boinc/wiki/GPUApp
 // Original contributor: Tuan Le (tuanle86@berkeley.edu)
 
 #include "openclapp.hpp"
diff --git a/samples/vboxmonitor/vboxmonitor.cpp b/samples/vboxmonitor/vboxmonitor.cpp
index 7d506881122..d3323ad34c7 100644
--- a/samples/vboxmonitor/vboxmonitor.cpp
+++ b/samples/vboxmonitor/vboxmonitor.cpp
@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 // vboxmonitor [options]     BOINC VirtualBox monitor
-// see: http://boinc.berkeley.edu/trac/wiki/VboxApps
+// see: https://github.com/BOINC/boinc/wiki/VboxApps
 // Options:
 //
 // Duplicate everything sent to stdin to the console and the VM Guest Log.
diff --git a/samples/vboxwrapper/vboxjob.h b/samples/vboxwrapper/vboxjob.h
index ba712a70fe7..6b6a9f47b2b 100644
--- a/samples/vboxwrapper/vboxjob.h
+++ b/samples/vboxwrapper/vboxjob.h
@@ -128,7 +128,7 @@ class VBOX_JOB {
 
     bool enable_graphics_support;
         // whether to enable graphics support by way of
-        // http://boinc.berkeley.edu/trac/wiki/GraphicsApi#File
+        // https://github.com/BOINC/boinc/wiki/GraphicsApi#File
 
     bool enable_screenshots_on_error;
         // capture screen shots during catastrophic events
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index 67d2d255946..8fb83cc40bd 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 // BOINC VirtualBox wrapper; lets you run apps in VMs
-// see: http://boinc.berkeley.edu/trac/wiki/VboxApps
+// see: https://github.com/BOINC/boinc/wiki/VboxApps
 //
 // usage: vboxwrapper [options]
 //
diff --git a/samples/wrapper/wrapper.cpp b/samples/wrapper/wrapper.cpp
index af8304155df..70e2bd2b9df 100644
--- a/samples/wrapper/wrapper.cpp
+++ b/samples/wrapper/wrapper.cpp
@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 // BOINC wrapper - lets you use non-BOINC apps with BOINC
-// See https://boinc.berkeley.edu/trac/wiki/WrapperApp
+// See https://github.com/BOINC/boinc/wiki/WrapperApp
 //
 // cmdline options:
 // --device N       macro-substitute N for $GPU_DEVICE_NUM
diff --git a/sched/assimilator.cpp b/sched/assimilator.cpp
index 90bd6dfde6e..3f62321003d 100644
--- a/sched/assimilator.cpp
+++ b/sched/assimilator.cpp
@@ -54,7 +54,7 @@ void usage(char* name) {
     fprintf(stderr,
         "This program is an 'assimilator'; it handles completed jobs.\n"
         "Normally it is run as a daemon from config.xml.\n"
-        "See: https://boinc.berkeley.edu/trac/wiki/BackendPrograms\n\n"
+        "See: https://github.com/BOINC/boinc/wiki/BackendPrograms\n\n"
     );
 
     fprintf(stderr, "usage: %s [options]\n"
diff --git a/sched/makefile_validator_test b/sched/makefile_validator_test
index da88ddfe44e..68849565504 100644
--- a/sched/makefile_validator_test
+++ b/sched/makefile_validator_test
@@ -1,5 +1,5 @@
 # makefile for building a validator test program; see
-# https://boinc.berkeley.edu/trac/wiki/ValidationSimple
+# https://github.com/BOINC/boinc/wiki/ValidationSimple
 
 # the object file containing result_init() etc. - replace with your own
 VALIDATOR_SRC = sample_bitwise_validator.cpp
diff --git a/tools/boinc_submit b/tools/boinc_submit
index 6852b360e6a..992b0d331d7 100755
--- a/tools/boinc_submit
+++ b/tools/boinc_submit
@@ -3,7 +3,7 @@
 <?php
 
 // Submit a single job.
-// Usage (see http://boinc.berkeley.edu/trac/wiki/SingleJob for more info):
+// Usage (see https://github.com/BOINC/boinc/wiki/SingleJob for more info):
 //
 // 1) Set the env var BOINC_PROJECT_DIR to the root directory of the project
 // 2) put boinc/tools/ in your search path
diff --git a/tools/manage_privileges b/tools/manage_privileges
index 6f0187a6c29..e0b6908682c 100755
--- a/tools/manage_privileges
+++ b/tools/manage_privileges
@@ -19,7 +19,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 // script for controlling "manage" privileges.
-// See http://boinc.berkeley.edu/trac/wiki/MultiUser
+// See https://github.com/BOINC/boinc/wiki/MultiUser
 // Run this from the project directory.
 
 // usage:
diff --git a/tools/update_versions b/tools/update_versions
index 6385f5ea3d1..f74d5b37d6d 100755
--- a/tools/update_versions
+++ b/tools/update_versions
@@ -21,7 +21,7 @@
 
 // script to create app versions,
 // and stage their files in the download dir.
-// See https://boinc.berkeley.edu/trac/wiki/AppVersionNew
+// See https://github.com/BOINC/boinc/wiki/AppVersionNew
 
 
 error_reporting(E_ALL);
diff --git a/tools/update_versions_v6 b/tools/update_versions_v6
index 8c9bd9ec4da..3db0fdaf143 100755
--- a/tools/update_versions_v6
+++ b/tools/update_versions_v6
@@ -10,7 +10,7 @@ config.xml must contain an <app_dir> which specifies the directory to search.
 
 apps/APPLICATION_NAME/ contains application versions for each application.
 
-See https://boinc.berkeley.edu/trac/wiki/UpdateVersions
+See https://github.com/BOINC/boinc/wiki/UpdateVersions
 
 """