diff --git a/README.md b/README.md
index 00f669f..1a98afb 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 For more information on weinre, please visit
-[http://pmuellr.github.com/weinre/](http://pmuellr.github.com/weinre/)
\ No newline at end of file
+[http://phonegap.github.com/weinre/](http://phonegap.github.com/weinre/)
\ No newline at end of file
diff --git a/weinre.build/vendor.properties b/weinre.build/vendor.properties
index c9084a9..8cad8e0 100644
--- a/weinre.build/vendor.properties
+++ b/weinre.build/vendor.properties
@@ -32,7 +32,7 @@
 #-----------------------------------------------------------
 
 JSON4J_VERSION:    1.1.2-incubating
-JSON4J_URL_PREFIX: http://www.apache.org/dist/incubator/wink
+JSON4J_URL_PREFIX: http://archive.apache.org/dist/incubator/wink/
 
 JSON4J_BIN_URL:    ${JSON4J_URL_PREFIX}/${JSON4J_VERSION}/apache-wink-${JSON4J_VERSION}.zip
 JSON4J_SRC_URL:    ${JSON4J_URL_PREFIX}/${JSON4J_VERSION}/apache-wink-${JSON4J_VERSION}-src.zip
diff --git a/weinre.doc/Building.body.html b/weinre.doc/Building.body.html
index ca19816..401fe8d 100644
--- a/weinre.doc/Building.body.html
+++ b/weinre.doc/Building.body.html
@@ -6,7 +6,7 @@
 -->
 
 <p>The source repository for weinre is maintained at 
-<a href="https://github.com/pmuellr/weinre">GitHub</a>.
+<a href="https://github.com/phonegap/weinre">GitHub</a>.
 
 <p>To build the current version of <span class="weinre">weinre</span>, you will 
 probably want to use Eclipse.  If that's not an option, there is some 
diff --git a/weinre.doc/Home.body.html b/weinre.doc/Home.body.html
index 0fa4ea6..8812b72 100644
--- a/weinre.doc/Home.body.html
+++ b/weinre.doc/Home.body.html
@@ -100,8 +100,8 @@
 <h2>Places</h2>
 
 <ul>
-<li>GitHub: <a href="https://github.com/pmuellr/weinre">https://github.com/pmuellr/weinre</a>
-<li>Documentation: <a href="http://pmuellr.github.com/weinre">http://pmuellr.github.com/weinre</a>
+<li>GitHub: <a href="https://github.com/phonegap/weinre">https://github.com/phonegap/weinre</a>
+<li>Documentation: <a href="http://phonegap.github.com/weinre">http://phonegap.github.com/weinre</a>
 <li>Google Group: <a href="http://groups.google.com/group/weinre">http://groups.google.com/group/weinre</a>
 </ul>
 
diff --git a/weinre.doc/Installing.body.html b/weinre.doc/Installing.body.html
index 28c031c..a723711 100644
--- a/weinre.doc/Installing.body.html
+++ b/weinre.doc/Installing.body.html
@@ -7,7 +7,7 @@
 
 <p><span class="weinre">weinre</span> is shipped as two archives
 available at
-<a href="https://github.com/pmuellr/weinre/archives/master">https://github.com/pmuellr/weinre/archives/master</a>
+<a href="https://github.com/phonegap/weinre/archives/master">https://github.com/phonegap/weinre/archives/master</a>
 
 <ul class="spaced">
 
diff --git a/weinre.doc/boilerplate-header.html.txt b/weinre.doc/boilerplate-header.html.txt
index eff65b5..f237a28 100644
--- a/weinre.doc/boilerplate-header.html.txt
+++ b/weinre.doc/boilerplate-header.html.txt
@@ -30,7 +30,7 @@
 
 <body>
 
-<a class="no-decoration" href="https://github.com/pmuellr/weinre"><div class="ribbon">Fork weinre on GitHub</div></a>
+<a class="no-decoration" href="https://github.com/phonegap/weinre"><div class="ribbon">Fork weinre on GitHub</div></a>
 
 <!-- ======================================================================= -->
 <h1 class="page-title">weinre - @PAGE_NAME@</h1>