diff --git a/guide.html b/guide.html
index d137371d..1d14937c 100644
--- a/guide.html
+++ b/guide.html
@@ -116,7 +116,7 @@
     </style>
 </head>
 <body data-spy="scroll" data-target="#nav">
-	<a href="https://github.com/joshdata/mailinabox/tree/website" class="visible-md visible-lg"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
+	<a href="https://github.com/mail-in-a-box/mailinabox/tree/website" class="visible-md visible-lg"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
 
 	<div id="back">
 		<div class="container">
@@ -269,7 +269,7 @@
 
 					<h2 id="setup">Setting Up The Box</h2>
 
-	    			<p class="pros">Clone our github repo <a href="https://github.com/JoshData/mailinabox">https://github.com/JoshData/mailinabox</a>, cd to the directory, and run <code>setup/start.sh</code>.</p>
+	    			<p class="pros">Clone our github repo <a href="https://github.com/mail-in-a-box/mailinabox">https://github.com/mail-in-a-box/mailinabox</a>, cd to the directory, and run <code>setup/start.sh</code>.</p>
 
 					<p>You will now have to log into your running box using SSH. Your cloud provider will probably give you some instructions on how to do that. If your personal computer has a command line, you'll be doing something like this:</p>
 
@@ -278,7 +278,7 @@
 					<p>Once inside, you will now get the Mail-in-a-Box code onto your box. Type:</p>
 
 					<pre>sudo apt-get install -y git
-git clone https://github.com/joshdata/mailinabox
+git clone https://github.com/mail-in-a-box/mailinabox
 cd mailinabox</pre>
 
 					<p>And then start the setup process:</p>
@@ -459,7 +459,7 @@ sudo setup/start.sh</pre>
 						<li>SSL: <a href="https://www.ssllabs.com/ssltest/analyze.html">ssllabs.com</a></li>
 					</ul>
 
-					<p>There are also Python scripts in the <a href="https://github.com/JoshData/mailinabox/tree/master/tests"><code>tests/</code></a> directory on GitHub for automated testing.</p>
+					<p>There are also Python scripts in the <a href="https://github.com/mail-in-a-box/mailinabox/tree/master/tests"><code>tests/</code></a> directory on GitHub for automated testing.</p>
 
 					<div class="hidden-xs" style="height: 200px"> </div>
 
diff --git a/index.html b/index.html
index 98f31925..3ae4ed37 100644
--- a/index.html
+++ b/index.html
@@ -112,7 +112,7 @@
 	<div class="container-fluid">
     	<div class="row">
     		<div id="main" class="col-sm-10 col-sm-push-2">
-				<a href="https://github.com/joshdata/mailinabox" class="visible-md visible-lg"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
+				<a href="https://github.com/mail-in-a-box/mailinabox" class="visible-md visible-lg"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
 
 
     			<div style="padding-left: 1em; max-width: 50em">
@@ -128,7 +128,7 @@
 					</div>    			
 	    			<div id="example">
 	    				<pre class="vagrant">sudo apt-get install vagrant git
-git clone <a href="https://github.com/joshdata/mailinabox">https://github.com/joshdata/mailinabox</a>
+git clone <a href="https://github.com/mail-in-a-box/mailinabox">https://github.com/mail-in-a-box/mailinabox</a>
 cd mailinabox
 
 vagrant up
@@ -144,7 +144,7 @@ sudo management/whats_next.py</pre>
 							<p>Log into your competely fresh Ubuntu machine using SSH, then type:</p>
 						</div>
 						<pre class="deploy hidden">sudo apt-get install git</span>
-git clone <a href="https://github.com/joshdata/mailinabox">https://github.com/joshdata/mailinabox</a>
+git clone <a href="https://github.com/mail-in-a-box/mailinabox">https://github.com/mail-in-a-box/mailinabox</a>
 cd mailinabox
 sudo setup/start.sh</pre>
 						<div class="deploy hidden">
@@ -171,7 +171,7 @@ sudo setup/start.sh</pre>
 
 					<p>For <strong>instructions</strong> for getting up and running, please read the <a href="guide.html">setup guide</a>.</p>
 
-					<p>If you need <strong>help</strong>, please <a href="https://discourse.mailinabox.email/">ask on the forum</a>. If you think you have found a problem in Mail-in-a-Box or don&rsquo;t get a response on the forum, then <a href="https://github.com/joshdata/mailinabox/issues">open an issue on github</a>.</p>
+					<p>If you need <strong>help</strong>, please <a href="https://discourse.mailinabox.email/">ask on the forum</a>. If you think you have found a problem in Mail-in-a-Box or don&rsquo;t get a response on the forum, then <a href="https://github.com/mail-in-a-box/mailinabox/issues">open an issue on github</a>.</p>
 
 					<p>We&rsquo;ll announce <strong>updates</strong> at <a href="https://twitter.com/mailinabox">@Mailinabox</a> on Twitter.</p>
 
@@ -190,7 +190,7 @@ sudo setup/start.sh</pre>
 
 					<h2>Development</h2>
 
-					<p>Development takes place on github at <a href="https://github.com/joshdata/mailinabox">https://github.com/joshdata/mailinabox</a>.</p>
+					<p>Development takes place on github at <a href="https://github.com/mail-in-a-box/mailinabox">https://github.com/mail-in-a-box/mailinabox</a>.</p>
 
 					<p>Take a look at the <a href="static/architecture.svg">system architecture diagram</a>.</p>
 
@@ -214,7 +214,7 @@ sudo setup/start.sh</pre>
     			<ul>
     				<li><a href="guide.html">setup guide</a></li>
     				<li><a href="https://discourse.mailinabox.email/">discussion forum</a></li>
-    				<li><a href="https://github.com/joshdata/mailinabox">github repository</a></li>
+    				<li><a href="https://github.com/mail-in-a-box/mailinabox">github repository</a></li>
     				<li><a href="static/architecture.svg">architecture diagram</a></li>
     				<li><a href="https://twitter.com/mailinabox">@Mailinabox</a></li>
     			</ul>
