diff --git a/Cask b/Cask
index d5b22e3e..af371cf6 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,4 @@
-(source "melpa" "http://melpa.milkbox.net/packages/")
+(source "melpa" "http://melpa.org/packages/")
 
 (development
  (depends-on "ecukes")
diff --git a/Makefile b/Makefile
index 9eb578a5..ad0e5ceb 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ sandbox: packages/archive-contents
 		--eval '(setq user-emacs-directory "$(SANDBOX)")' \
 		-l package \
 		--eval "(add-to-list 'package-archives '(\"gnu\" . \"http://elpa.gnu.org/packages/\") t)" \
-		--eval "(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.milkbox.net/packages/\") t)" \
+		--eval "(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.org/packages/\") t)" \
 		--eval "(add-to-list 'package-archives '(\"sandbox\" . \"$(shell pwd)/$(PKGDIR)/\") t)" \
 		--eval "(package-refresh-contents)"
 		--eval "(package-initialize)"
diff --git a/README.md b/README.md
index 0c8ecb7e..709e23bb 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ code using simple recipes. (Think of it as a server-side version of
 Packages are updated at intervals throughout the day.
 
 To browse available packages, check out the
-[archive index page](http://melpa.milkbox.net/).
+[archive index page](http://melpa.org/).
 
 Adding packages is as simple as submitting a pull request; read on for
 details.
@@ -41,7 +41,7 @@ Enable installation of packages from MELPA by adding an entry to
 ```lisp
 (require 'package)
 (add-to-list 'package-archives
-             '("melpa" . "http://melpa.milkbox.net/packages/") t)
+             '("melpa" . "http://melpa.org/packages/") t)
 (when (< emacs-major-version 24)
   ;; For important compatibility libraries like cl-lib
   (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
@@ -412,7 +412,7 @@ format.
  such as Emacs 24. If you have an older version of Emacs, you can get a
  suitable `package.el` [here](http://bit.ly/pkg-el23).
 
-[melpa]: http://melpa.milkbox.net
+[melpa]: http://melpa.org
 
 
 ## API
@@ -476,11 +476,11 @@ in your `package-archives` list.
 
 ```lisp
 (add-to-list 'package-archives
-             '("melpa-stable" . "http://melpa-stable.milkbox.net/packages/") t)
+             '("melpa-stable" . "http://stable.melpa.org/packages/") t)
 ```
 
 An online list of available packages can be found at 
-[http://melpa-stable.milkbox.net](http://melpa-stable.milkbox.net).
+[http://stable.melpa.org](http://stable.melpa.org).
 
 ### Stable Version Generation
 
diff --git a/cfg/etc/nginx/sites-available/melpa b/cfg/etc/nginx/sites-available/melpa
index 503fa016..dde89e69 100644
--- a/cfg/etc/nginx/sites-available/melpa
+++ b/cfg/etc/nginx/sites-available/melpa
@@ -29,7 +29,7 @@ server {
 	# proxy to Apache 2 and mod_python
 	location / {
 	    proxy_pass         http://127.0.0.1:1337/;
-	    proxy_redirect     http://melpa.milkbox.net:1337/ http://melpa.milkbox.net/;
+	    proxy_redirect     http://melpa.org:1337/ http://melpa.org/;
 	    # proxy_redirect     off;
 	    chunked_transfer_encoding off;
 
diff --git a/cfg/etc/nginx/sites-available/melpa-stable b/cfg/etc/nginx/sites-available/melpa-stable
index 43f0889a..ed29a817 100644
--- a/cfg/etc/nginx/sites-available/melpa-stable
+++ b/cfg/etc/nginx/sites-available/melpa-stable
@@ -19,7 +19,7 @@
 
 server {
 	server_name hiddencameras.milkbox.net;
-	rewrite ^ $scheme://melpa-stable.milkbox.net$request_uri? permanent;
+	rewrite ^ $scheme://stable.melpa.org$request_uri? permanent;
 }
 
 server {
diff --git a/cfg/home/etc/nginx b/cfg/home/etc/nginx
index 89988bcf..ec1c9bbd 100644
--- a/cfg/home/etc/nginx
+++ b/cfg/home/etc/nginx
@@ -71,7 +71,7 @@ http {
 	##
 
 	server {
-		server_name melpa.milkbox.net;
+		server_name melpa.org;
 		server_tokens off;
 		server_name_in_redirect off;
 	
diff --git a/cfg/home/etc/nginx-stable b/cfg/home/etc/nginx-stable
index 1920a365..cd5af6a2 100644
--- a/cfg/home/etc/nginx-stable
+++ b/cfg/home/etc/nginx-stable
@@ -72,7 +72,7 @@ http {
 	##
 
 	server {
-		server_name melpa-stable.milkbox.net;
+		server_name stable.melpa.org;
 		server_tokens off;
 		server_name_in_redirect off;
 	
diff --git a/cfg/home/service/reporter-stable/run b/cfg/home/service/reporter-stable/run
index 0305397c..539ad857 100755
--- a/cfg/home/service/reporter-stable/run
+++ b/cfg/home/service/reporter-stable/run
@@ -8,7 +8,7 @@ BODY=`mktemp`
 
 cd ${HOME}/melpa
 
-echo "To: MP <dcurtis@milkbox.net>" > ${BODY}
+echo "To: MP <d@milkbox.net>" > ${BODY}
 echo "Subject: [MELPA] `date "+%Y%m%d %H:%M %z"`" >> ${BODY}
 echo >> ${BODY}
 echo "# Old Packages" >> ${BODY}
diff --git a/cfg/home/service/reporter/run b/cfg/home/service/reporter/run
index 20ee371f..8b3bb55b 100755
--- a/cfg/home/service/reporter/run
+++ b/cfg/home/service/reporter/run
@@ -8,7 +8,7 @@ BODY=`mktemp`
 
 cd ${HOME}/melpa
 
-echo "To: MP <dcurtis@milkbox.net>" > ${BODY}
+echo "To: MP <d@milkbox.net>" > ${BODY}
 echo "Subject: [MELPA] `date "+%Y%m%d %H:%M %z"`" >> ${BODY}
 echo >> ${BODY}
 echo "# Old Packages" >> ${BODY}
diff --git a/html/Makefile b/html/Makefile
index 7a9e91d2..c1a93284 100644
--- a/html/Makefile
+++ b/html/Makefile
@@ -7,7 +7,7 @@ updates.rss: updates.rss.erb
 	erb updates.rss.erb > updates.rss.tmp && mv updates.rss.tmp updates.rss
 
 livejson:
-	for f in recipes archive download_counts build-status; do curl http://melpa.milkbox.net/$$f.json > $$f.json; done
+	for f in recipes archive download_counts build-status; do curl http://melpa.org/$$f.json > $$f.json; done
 
 clean:
 	-rm -v updates.rss
diff --git a/html/partials/getting-started.html b/html/partials/getting-started.html
index 7b633987..d120918c 100644
--- a/html/partials/getting-started.html
+++ b/html/partials/getting-started.html
@@ -10,13 +10,13 @@
 
       <pre><code>(require 'package)
 (add-to-list 'package-archives
-  '("melpa" . "http://melpa.milkbox.net/packages/") t)</code></pre>
+  '("melpa" . "http://melpa.org/packages/") t)</code></pre>
 
       <p>or to add the stable package repository, use this snippet:</p>
 
       <pre><code>(require 'package)
 (add-to-list 'package-archives
-  '("melpa-stable" . "http://melpa-stable.milkbox.net/packages/") t)</code></pre>
+  '("melpa-stable" . "http://stable.melpa.org/packages/") t)</code></pre>
 
       <p>In Emacs &lt; 24, you'll also need to explicitly include the GNU
         ELPA archive, which provides important compatibility libraries like <code>cl-lib</code>:</p>
diff --git a/html/updates.rss.erb b/html/updates.rss.erb
index 68378937..b461bc8f 100644
--- a/html/updates.rss.erb
+++ b/html/updates.rss.erb
@@ -3,10 +3,10 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
    xmlns:atom="http://www.w3.org/2005/Atom">
-<% base_url = "http://melpa.milkbox.net/" %>
+<% base_url = "http://melpa.org/" %>
   <channel>
     <title>MELPA package updates</title>
-    <link>http://melpa.milkbox.net</link>
+    <link>http://melpa.org</link>
     <atom:link href="<%= base_url %>updates.rss" rel="self" type="application/rss+xml" />
     <language>en-us</language>
     <ttl>40</ttl>