diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ce03ad43..68460b98 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ information to effectively respond to your bug report or contribution.
 ## Reporting Bugs/Feature Requests
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/cowrie/cowrie), or [recently closed](https://github.com/micheloosterhof/cowrie/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+When filing an issue, please check [existing open](https://github.com/cowrie/cowrie), or [recently closed](https://github.com/cowrie/cowrie/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
diff --git a/INSTALL.md b/INSTALL.md
index ef0ffacb..55208903 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -47,7 +47,7 @@ $ sudo su - cowrie
 ## Step 3: Checkout the code
 
 ```
-$ git clone http://github.com/micheloosterhof/cowrie
+$ git clone http://github.com/cowrie/cowrie
 Cloning into 'cowrie'...
 remote: Counting objects: 2965, done.
 remote: Compressing objects: 100% (1025/1025), done.
diff --git a/README.md b/README.md
index 731666b9..5566bcc2 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Cowrie is a medium interaction SSH and Telnet honeypot designed to
 log brute force attacks and the shell interaction performed by the
 attacker.
 
-[Cowrie](http://github.com/micheloosterhof/cowrie/) is developed by Michel Oosterhof.
+[Cowrie](http://github.com/cowrie/cowrie/) is developed by Michel Oosterhof.
 
 ## Slack
 
diff --git a/setup.py b/setup.py
index df41f48c..783fc42f 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     maintainer="Michel Oosterhof",
     maintainer_email="michel@oosterhof.net",
     keywords="ssh telnet honeypot",
-    url="https://github.com/micheloosterhof/cowrie",
+    url="https://github.com/cowrie/cowrie",
     packages=find_packages(),
     include_package_data=True,
     package_data={'': ['*.md']},