diff --git a/cdist/conf/type/__cdist/parameter/default/source b/cdist/conf/type/__cdist/parameter/default/source
index d669308f..3f8e31ad 100644
--- a/cdist/conf/type/__cdist/parameter/default/source
+++ b/cdist/conf/type/__cdist/parameter/default/source
@@ -1 +1 @@
-git://github.com/telmich/cdist.git
+git://github.com/ungleich/cdist.git
diff --git a/cdist/conf/type/__cdistmarker/gencode-remote b/cdist/conf/type/__cdistmarker/gencode-remote
index 92ea582b..5e889e52 100755
--- a/cdist/conf/type/__cdistmarker/gencode-remote
+++ b/cdist/conf/type/__cdistmarker/gencode-remote
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2011 Daniel Maher (phrawzty+cdist at gmail.com)
 #
-# This file is part of cdist (https://github.com/telmich/cdist/).
+# This file is part of cdist.
 #
 # cdist is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/cdist/conf/type/__git/man.rst b/cdist/conf/type/__git/man.rst
index 64adfd2f..17e9c623 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://github.com/telmich/cdist.git --branch 2.1
+    __git /home/nico/cdist --source git://github.com/ungleich/cdist.git --branch 2.1
 
 
 AUTHORS
diff --git a/docs/src/cdist-hacker.rst b/docs/src/cdist-hacker.rst
index efc5da4b..d7d6a056 100644
--- a/docs/src/cdist-hacker.rst
+++ b/docs/src/cdist-hacker.rst
@@ -50,8 +50,8 @@ work nor kill the authors brain:
   the other needs to be improved.
 
 As soon as your work meets these requirements, write a mail
-for inclusion to the mailinglist **cdist at cdist -- at -- l.schottelius.org**
-or open a pull request at http://github.com/telmich/cdist.
+for inclusion to the mailinglist **cdist-configuration-management at googlegroups.com**
+or open a pull request at http://github.com/ungleich/cdist.
 
 
 How to submit a new type
@@ -77,7 +77,7 @@ The following workflow works fine for most developers
 .. code-block:: sh
 
     # get latest upstream master branch
-    git clone https://github.com/telmich/cdist.git
+    git clone https://github.com/ungleich/cdist.git
 
     # update if already existing
     cd cdist; git fetch -v; git merge origin/master
diff --git a/docs/web/cdist/install.mdwn b/docs/web/cdist/install.mdwn
index cff2d369..0ced26db 100644
--- a/docs/web/cdist/install.mdwn
+++ b/docs/web/cdist/install.mdwn
@@ -29,7 +29,7 @@ immediately.
 
 To install cdist, execute the following commands:
 
-    git clone https://github.com/telmich/cdist.git
+    git clone https://github.com/ungleich/cdist.git
     cd cdist
     export PATH=$PATH:$(pwd -P)/bin