diff --git a/README.rst b/README.rst
index 18de9e6..05f74fc 100644
--- a/README.rst
+++ b/README.rst
@@ -6,8 +6,8 @@ Unlike other dynamic dns services its intention is that you do not
 have to click a link every 30 days to keep your domain enabled or other jokes
 like this.
 
-nsupdate.info is is intended to be self hostable, but there will most probably
-be a free service on http://www.nsupdate.info/
+nsupdate.info is is intended to be self hostable, but there is also a free
+service on http://nsupdate.info/
 
 
 Installation
@@ -22,7 +22,7 @@ installation (here with virtualenvwrapper)::
 
 Clone the repo and cd into::
 
-    git clone git@github.com:asmaps/nsupdate.info.git nsupdate
+    git clone git@github.com:nsupdate-info/nsupdate.info.git nsupdate
     cd nsupdate
 
 
@@ -33,4 +33,3 @@ Then install the requirements::
 
 From time to time execute this again to install the newest dependencies.
 Maybe in future there will be a PyPi package to install directly with pip.
-
diff --git a/nsupdate/main/templates/main/home.html b/nsupdate/main/templates/main/home.html
index 9d5f5e9..51678c2 100644
--- a/nsupdate/main/templates/main/home.html
+++ b/nsupdate/main/templates/main/home.html
@@ -15,7 +15,7 @@
         {% endif %}
         <p>nsupdate.info, the Free and Open Source Dynamic DNS service for you.</p>
         <p>
-<iframe src="http://ghbtns.com/github-btn.html?user=asmaps&repo=nsupdate.info&type=watch&count=true"
+<iframe src="http://ghbtns.com/github-btn.html?user=nsupdate-info&repo=nsupdate.info&type=watch&count=true"
   allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
         </p>
       </div>
@@ -31,7 +31,7 @@
         <h1><i class="icon-globe icon-3x"></i></h1>
         <h3>World Wide Web</h3>
         <p>
-            nsupdate.info is a <a href="https://github.com/asmaps/nsupdate.info">free and open-source</a> dynamic DNS service with IPv4 and IPv6 support.
+            nsupdate.info is a <a href="https://github.com/nsupdate-info/nsupdate.info">free and open-source</a> dynamic DNS service with IPv4 and IPv6 support.
         </p>
     </div>
     <div class="col-sm-4" style="text-align: center">
diff --git a/nsupdate/nsupdate/settings.py b/nsupdate/nsupdate/settings.py
index 93eef07..b9f94f0 100644
--- a/nsupdate/nsupdate/settings.py
+++ b/nsupdate/nsupdate/settings.py
@@ -44,7 +44,7 @@ UPDATE_KEY = 'YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYW
 
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = ['nsupdate.info', 'www.nsupdate.info']
+ALLOWED_HOSTS = ['nsupdate.info', ]
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
diff --git a/nsupdate/nsupdate/templates/base.html b/nsupdate/nsupdate/templates/base.html
index 6f708b0..ecd2bef 100644
--- a/nsupdate/nsupdate/templates/base.html
+++ b/nsupdate/nsupdate/templates/base.html
@@ -87,7 +87,7 @@
         <div class="footer">
             <div class="container">
             <p class="text-muted credit">
-                Sourcecode available at <a href="https://github.com/asmaps/nsupdate.info">GitHub</a>
+                Sourcecode available at <a href="https://github.com/nsupdate-info/nsupdate.info">GitHub</a>
                 -
                 developed by <a href="https://github.com/asmaps/">Arne Schauf</a>, 
                 <a href="https://github.com/Samuirai/">Fabian Faessler</a>, 
diff --git a/setup.py b/setup.py
index f84787d..871bb76 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ with open('README.rst') as f:
 setup(
     name='nsupdate',
     version='0.0.1a0',
-    url='http://github.com/asmaps/nsupdate.info/',
+    url='http://github.com/nsupdate-info/nsupdate.info/',
     license='BSD',
     author='The nsupdate.info Team (see AUTHORS)',
     author_email='info@nsupdate.info',