diff --git a/PKGBUILD.in b/PKGBUILD.in
index c967249d..c0188e68 100755
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -9,7 +9,7 @@ pkgver=$version
 pkgrel=1
 pkgdesc='A Usable Configuration Management System"'
 arch=('any')
-url='http://www.nico.schottelius.org/software/cdist/'
+url='https://www.cdi.st/'
 license=('GPL3')
 depends=('python>=3.2.0')
 source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
diff --git a/cdist/argparse.py b/cdist/argparse.py
index 3ebdc138..421d1b54 100644
--- a/cdist/argparse.py
+++ b/cdist/argparse.py
@@ -13,7 +13,7 @@ BETA_COMMANDS = set(('install', 'inventory', ))
 BETA_ARGS = {
     'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
 }
-EPILOG = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
+EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist"
 # Parser others can reuse
 parser = None
 
diff --git a/cdist/conf/type/__cdist/man.rst b/cdist/conf/type/__cdist/man.rst
index 15c77d7f..be082781 100644
--- a/cdist/conf/type/__cdist/man.rst
+++ b/cdist/conf/type/__cdist/man.rst
@@ -30,7 +30,7 @@ username
 
 source
     Select the source from which to clone cdist from.
-    Defaults to "git://code.ungleich.ch/ungleich-public/cdist.git".
+    Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git".
 
 
 branch
@@ -47,7 +47,7 @@ EXAMPLES
     __cdist /home/cdist/cdist
 
     # Use alternative source
-    __cdist --source "git://code.ungleich.ch/ungleich-public/cdist" /home/cdist/cdist
+    __cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist
 
 
 AUTHORS
diff --git a/cdist/conf/type/__cdist/parameter/default/source b/cdist/conf/type/__cdist/parameter/default/source
index 5f44a285..1ad3a250 100644
--- a/cdist/conf/type/__cdist/parameter/default/source
+++ b/cdist/conf/type/__cdist/parameter/default/source
@@ -1 +1 @@
-git://code.ungleich.ch/ungleich-public/cdist.git
+git@code.ungleich.ch:ungleich-public/cdist.git
diff --git a/cdist/conf/type/__git/man.rst b/cdist/conf/type/__git/man.rst
index aa704d2b..130925c8 100644
--- a/cdist/conf/type/__git/man.rst
+++ b/cdist/conf/type/__git/man.rst
@@ -44,7 +44,7 @@ EXAMPLES
     __git /home/services/dokuwiki --source git://github.com/splitbrain/dokuwiki.git
 
     # Checkout cdist, stay on branch 2.1
-    __git /home/nico/cdist --source git://code.ungleich.ch/ungleich-public/cdist.git --branch 2.1
+    __git /home/nico/cdist --source git@code.ungleich.ch:ungleich-public/cdist.git --branch 2.1
 
 
 AUTHORS
diff --git a/docs/changelog b/docs/changelog
index 38c59047..e3fd9368 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,6 +4,9 @@ Changelog
 next:
 	* Documentation: Add 'Perils of CDIST_ORDER_DEPENDENCY' sub-section (Darko Poljak)
 	* Build: Clean and separate end user targets into Makefile and maintainer targets into build-helper (Darko Poljak)
+	* Core: Update residual references to old cdist homepage (Darko Poljak)
+	* Documentation: Update residual references to old cdist homepage and git source (Darko Poljak)
+	* Type __cdist: Fix non working 'git://' protocol source (Darko Poljak)
 
 5.0.0: 2019-05-05
 	* Type __zypper_service: Fix spelling error in manpage (Dmitry Bogatov)
diff --git a/docs/src/cdist-install.rst b/docs/src/cdist-install.rst
index 4d3df8f8..a9b7d6b5 100644
--- a/docs/src/cdist-install.rst
+++ b/docs/src/cdist-install.rst
@@ -43,6 +43,8 @@ To install cdist, execute the following commands:
 From version 4.2.0 cdist tags and releases are signed.
 You can get GPG public key used for signing `here <_static/pgp-key-EFD2AE4EC36B6901.asc>`_.
 
+You can also get cdist from `github mirror <https://github.com/ungleich/cdist>`_.
+
 To install cdist with distutils from cloned repository, first you have to
 create version.py:
 
diff --git a/docs/src/cdist-quickstart.rst b/docs/src/cdist-quickstart.rst
index b9220b67..99af869f 100644
--- a/docs/src/cdist-quickstart.rst
+++ b/docs/src/cdist-quickstart.rst
@@ -54,9 +54,7 @@ we can use cdist to configure it. You can copy and paste the following
 code into your shell to get started and configure localhost::
 
     # Get cdist 
-    # Mirrors can be found on
-    # http://www.nico.schottelius.org/software/cdist/install/#index2h4
-    git clone git://code.ungleich.ch/ungleich-public/cdist
+    git clone git@code.ungleich.ch:ungleich-public/cdist.git
 
     # Create manifest (maps configuration to host(s)
     cd cdist