diff --git a/.gitmodules b/.gitmodules
index c43d9fe2a..0b4159ca1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "libdivecomputer"]
 	path = libdivecomputer
-	url = git://github.com/Subsurface-divelog/libdc.git
+	url = git://github.com/Subsurface/libdc.git
 	branch = Subsurface-NG
diff --git a/CODINGSTYLE.md b/CODINGSTYLE.md
index a185f65b0..4bd016efd 100644
--- a/CODINGSTYLE.md
+++ b/CODINGSTYLE.md
@@ -402,4 +402,4 @@ match ExtraWhitespace /\s\+$\| \+\ze\t/
 ```
 
 [1]: http://doc.qt.io/qt-5/qstring.html#manipulating-string-data
-[2]: https://github.com/Subsurface-divelog/subsurface/blob/master/core/membuffer.h
+[2]: https://github.com/Subsurface/subsurface/blob/master/core/membuffer.h
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 00471f01a..8220dee89 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -81,9 +81,9 @@ In order to make reviews simpler and have contributions merged faster in the cod
 [2]: http://freenode.net/
 [3]: https://www.transifex.com/
 [4]: https://www.transifex.com/projects/p/subsurface/
-[5]: https://github.com/Subsurface-divelog/subsurface/issues
-[6]: https://github.com/Subsurface-divelog/subsurface/pulls
+[5]: https://github.com/Subsurface/subsurface/issues
+[6]: https://github.com/Subsurface/subsurface/pulls
 [7]: https://www.kernel.org/pub/software/scm/git/docs/user-manual.html
 [8]: https://gerrit-review.googlesource.com/Documentation/user-signedoffby.html
 [9]: https://subsurface-divelog.org/wp-content/uploads/2011/10/Screenshot-gitk-subsurface-1.png "Example with gitk"
-[10]: https://github.com/Subsurface-divelog/subsurface/blob/master/CodingStyle
+[10]: https://github.com/Subsurface/subsurface/blob/master/CodingStyle
diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot
index 64f9e7ed3..8b118ba75 100644
--- a/Documentation/50-pot/subsurface-user-manual.pot
+++ b/Documentation/50-pot/subsurface-user-manual.pot
@@ -133,7 +133,7 @@ msgid ""
 "https://subsurface-divelog.org/[_Subsurface_ web site].  Please discuss "
 "issues with this program by sending an email to "
 "mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs "
-"at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker].  "
+"at https://github.com/Subsurface/subsurface/issues[our bugtracker].  "
 "For instructions on how to build the software and (if needed) its "
 "dependencies please consult the INSTALL file included with the source code."
 msgstr ""
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index a706ac5bf..fb6011584 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -33,7 +33,7 @@ the software, consult the _Downloads_ page on the
 https://subsurface-divelog.org/[_Subsurface_ web site].
 Please discuss issues with this program by sending an email to
 mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs at
-https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker].  For instructions on how to build the
+https://github.com/Subsurface/subsurface/issues[our bugtracker].  For instructions on how to build the
 software and (if needed) its dependencies please consult the INSTALL file
 included with the source code.
 
diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt
index bf74640c6..6f509188b 100644
--- a/Documentation/user-manual_es.txt
+++ b/Documentation/user-manual_es.txt
@@ -59,7 +59,7 @@ Este manual explica como utilizar el programa _Subsurface_. Para instalar
 el software, consulta la página Descargas en https://subsurface-divelog.org/[la
 web]. Por favor, comenta los problemas que tengas con este programa enviando un
 mail a mailto:subsurface@subsurface-divelog.org[nuestra lista de correo] e informa de
-fallos en https://github.com/Subsurface-divelog/subsurface/issues[nuestro bugtracker].
+fallos en https://github.com/Subsurface/subsurface/issues[nuestro bugtracker].
 Para instrucciones acerca de como compilar el software y (en caso necesario)
 sus dependencias, por favor, consulta el archivo INSTALL incluido con el código
 fuente.
diff --git a/Documentation/user-manual_nl.txt b/Documentation/user-manual_nl.txt
index 9d9091fd4..f48c49497 100644
--- a/Documentation/user-manual_nl.txt
+++ b/Documentation/user-manual_nl.txt
@@ -57,7 +57,7 @@ moet installeren staat uitgelegd op _Downloaden_ page on the
 https://subsurface-divelog.org/[_Subsurface_ website]. Vragen over of problemen met
 het programma kunnen bij de ontwikkelaars gemeld worden via email op
 mailto:subsurface@subsurface-divelog.org[onze mailinglijst]. Fouten kunnen
-ook gemeld worden op https://github.com/Subsurface-divelog/subsurface/issues[onze bugtracker].
+ook gemeld worden op https://github.com/Subsurface/subsurface/issues[onze bugtracker].
 Instructies hoe _Subsurface_ zelf te compileren vanuit de broncode staan ook op
 onze website en in het INSTALL bestand in de broncode.
 
diff --git a/Documentation/user-manual_ru.txt b/Documentation/user-manual_ru.txt
index 76d1cc45c..cb5585f07 100644
--- a/Documentation/user-manual_ru.txt
+++ b/Documentation/user-manual_ru.txt
@@ -55,7 +55,7 @@ libdivecomputer.
 обратитесь к странице _Downloads_ на http://subsurface-divelog.org/[веб-сайте
 _Subsurface_].  Вы можете обсудить эту программу, отправив email на адрес
 mailto:subsurface@subsurface-divelog.org[списка рассылки] и сообщить об ошибках на сайте
-https://github.com/Subsurface-divelog/subsurface/issues[треккера ошибок]. Инструкции по самостоятельной сборке
+https://github.com/Subsurface/subsurface/issues[треккера ошибок]. Инструкции по самостоятельной сборке
 _Subsurface_ и, если необходимо, зависимостей, описаны в файле INSTALL, распространяемом
 вместе с исходными текстами.
 
diff --git a/INSTALL b/INSTALL
index 321c6cef0..cbda0b9f1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ Getting Subsurface source
 
 You can get the sources to the latest development version from our git
 repository:
-    git clone http://github.com/Subsurface-divelog/subsurface.git
+    git clone http://github.com/Subsurface/subsurface.git
 
 You keep it updated by doing:
     git checkout master
@@ -31,7 +31,7 @@ Getting our flavor of libdivecomputer
 
 All our prebuilt binaries (see https://subsurface-divelog.org/download)
 are built using our own custom "flavor" of libdivecomputer
-see https://github.com/Subsurface-divelog/libdc.git
+see https://github.com/Subsurface/libdc.git
 
 In order to get the modified sources, do
 - locate yourself in the subsurface repo on your local computer
@@ -213,7 +213,7 @@ like this:
 
 mkdir -p ~/src
 cd ~/src
-git clone https://github.com/Subsurface-divelog/subsurface.git
+git clone https://github.com/Subsurface/subsurface.git
 ./subsurface/scripts/build.sh # <- this step will take quite a while as it
                               #    compiles a handful of libraries before
 			      #    building Subsurface
diff --git a/README.md b/README.md
index 370846a65..50d9042fa 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,14 @@ Subsurface can be found at http://subsurface-divelog.org
 Our user forum is at http://subsurface-divelog.org/user-forum/
 
 Report bugs and issues at
-https://github.com/Subsurface-divelog/subsurface/issues
+https://github.com/Subsurface/subsurface/issues
 
 License: GPLv2
 
 We frequently make new test versions of Subsurface available at
 http://subsurface-divelog.org/downloads/test/ and you always can get the
 latest builds (with some caveats about installability) at
-https://github.com/Subsurface-divelog/subsurface/releases/tag/continuous
+https://github.com/subsurface/subsurface/releases/tag/ci-release
 
 These tend to contain the latest bug fixes and features, but also
 occasionally the latest bugs and issues. Please understand when using them
@@ -27,11 +27,11 @@ You can get the sources to the latest development version from the git
 repository:
 
 ```
-git clone https://github.com/Subsurface-divelog/subsurface.git
+git clone https://github.com/Subsurface/subsurface.git
 ```
 
 You can also fork the repository and browse the sources at the same site,
-simply using https://github.com/Subsurface-divelog/subsurface
+simply using https://github.com/Subsurface/subsurface
 
 If you want the latest release (instead of the bleeding edge
 development version) you can either get this via git or the release tar
@@ -102,7 +102,7 @@ Go to http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
 to subscribe.
 
 If you want to contribute code, please open a pull request with signed-off
-commits at https://github.com/Subsurface-divelog/subsurface/pulls
+commits at https://github.com/Subsurface/subsurface/pulls
 (alternatively, you can also send your patches as emails to the developer
 mailing list).
 
diff --git a/appdata/subsurface.appdata.xml.in b/appdata/subsurface.appdata.xml.in
index 11d955c22..ca5f468a6 100644
--- a/appdata/subsurface.appdata.xml.in
+++ b/appdata/subsurface.appdata.xml.in
@@ -21,14 +21,14 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/Subsurface-divelog/subsurface/master/appdata/main.png</image>
+      <image>https://raw.githubusercontent.com/Subsurface/subsurface/master/appdata/main.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/Subsurface-divelog/subsurface/master/appdata/diveplanner.png</image>
+      <image>https://raw.githubusercontent.com/Subsurface/subsurface/master/appdata/diveplanner.png</image>
     </screenshot>
   </screenshots>
   <url type="homepage">https://subsurface-divelog.org</url>
-  <url type="bugtracker">https://github.com/Subsurface-divelog/subsurface/issues</url>
+  <url type="bugtracker">https://github.com/Subsurface/subsurface/issues</url>
   <url type="faq">https://subsurface-divelog.org/faq/</url>
   <url type="help">https://subsurface-divelog.org/documentation/</url>
   <url type="translate">https://www.transifex.com/subsurface/subsurface/</url>
diff --git a/packaging/OBS/make-package.sh b/packaging/OBS/make-package.sh
index 6c3ccaf35..ac33f9e58 100644
--- a/packaging/OBS/make-package.sh
+++ b/packaging/OBS/make-package.sh
@@ -9,7 +9,7 @@ if [[ $(pwd | grep "subsurface$") || ! -d subsurface || ! -d subsurface/libdivec
 	exit 1;
 fi
 if [[ ! -d googlemaps ]] ; then
-	echo "Please make sure you have the current master of git://github.com/Subsurface-divelog/googlemaps"
+	echo "Please make sure you have the current master of git://github.com/Subsurface/googlemaps"
 	echo "checked out in parallel to the Subsurface directory"
 	exit 1;
 fi
diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh
index 386c0f91b..3fe5d0962 100644
--- a/packaging/ubuntu/make-package.sh
+++ b/packaging/ubuntu/make-package.sh
@@ -12,7 +12,7 @@ if [[ $(pwd | grep "subsurface$") || ! -d subsurface || ! -d subsurface/libdivec
 	exit 1;
 fi
 if [[ ! -d googlemaps ]] ; then
-	echo "Please make sure you have the current master of git://github.com/Subsurface-divelog/googlemaps"
+	echo "Please make sure you have the current master of git://github.com/Subsurface/googlemaps"
 	echo "checked out in parallel to the Subsurface directory"
 	exit 1;
 fi
diff --git a/scripts/docker/trusty-qt512/Dockerfile b/scripts/docker/trusty-qt512/Dockerfile
index 95310689d..1e21076c1 100644
--- a/scripts/docker/trusty-qt512/Dockerfile
+++ b/scripts/docker/trusty-qt512/Dockerfile
@@ -74,7 +74,7 @@ RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client
 
 # now build Subsurface once to populate the dependencies we don't get from
 # Ubuntu but that aren't really part of Subsurface (libgit, grantlee, googlemaps)
-RUN git clone git://github.com/Subsurface-divelog/subsurface
+RUN git clone git://github.com/Subsurface/subsurface
 RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
 
 # remove the source, but keep the install-root
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh
index 29bece843..870b86ef7 100755
--- a/scripts/get-dep-lib.sh
+++ b/scripts/get-dep-lib.sh
@@ -166,7 +166,7 @@ for package in "${PACKAGES[@]}" ; do
 			git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
 			;;
 		googlemaps)
-			git_checkout_library googlemaps master https://github.com/Subsurface-divelog/googlemaps.git
+			git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
 			;;
 		hidapi)
 			git_checkout_library hidapi master https://github.com/signal11/hidapi.git
diff --git a/scripts/linux/before_install.sh b/scripts/linux/before_install.sh
index 28e7bc0c5..f38ea4649 100644
--- a/scripts/linux/before_install.sh
+++ b/scripts/linux/before_install.sh
@@ -28,6 +28,6 @@ sh -e /etc/init.d/xvfb start
 
 # TestParsePerformance needs this data file to test XML parsing performance
 pushd ..
-git clone https://github.com/Subsurface-divelog/large-anonymous-sample-data
+git clone https://github.com/Subsurface/large-anonymous-sample-data
 xzcat large-anonymous-sample-data/large-anon.ssrf.xz > subsurface/dives/large-anon.ssrf
 popd
diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh
index 092488a50..1317e7288 100644
--- a/scripts/windows/before_install.sh
+++ b/scripts/windows/before_install.sh
@@ -57,7 +57,7 @@ fi
 
 echo "Get googlemaps"
 cd ${TRAVIS_BUILD_DIR}/..
-git clone https://github.com/Subsurface-divelog/googlemaps.git
+git clone https://github.com/Subsurface/googlemaps.git
 
 echo "Get Grantlee"
 cd ${TRAVIS_BUILD_DIR}/..
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 4edb161ae..5a1a6f4ee 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -30,7 +30,7 @@ apps:
 
 parts:
   googlemaps:
-    source: git://github.com/Subsurface-divelog/googlemaps.git
+    source: git://github.com/Subsurface/googlemaps.git
     build-packages:
     - wget
     override-pull: |
diff --git a/tests/testparseperformance.cpp b/tests/testparseperformance.cpp
index e7cce9303..c80799cff 100644
--- a/tests/testparseperformance.cpp
+++ b/tests/testparseperformance.cpp
@@ -10,7 +10,7 @@
 #include <QDebug>
 #include <QNetworkProxy>
 
-#define LARGE_TEST_REPO "https://github.com/Subsurface-divelog/large-anonymous-sample-data"
+#define LARGE_TEST_REPO "https://github.com/Subsurface/large-anonymous-sample-data"
 
 void TestParsePerformance::initTestCase()
 {