diff --git a/ChangeLog b/ChangeLog
index 49181e8a9c..09c3b14a49 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11605,4 +11605,5 @@
 	* include/nuttx/timer/rtc.h and drivers/timers/rtc.c:  Simplify the RTC
 	  interface.  The old interface was way to complex and was not fully
 	  implemented anywhere (2016-04-02).
+	* Moved NuttX repository to https://bitbucket.org/nuttx/nuttx (2016-04-06).
 
diff --git a/Documentation b/Documentation
index a1eb57539f..bb58e2f16a 160000
--- a/Documentation
+++ b/Documentation
@@ -1 +1 @@
-Subproject commit a1eb57539fc9f63eabe5bcff7d68d98ad41447b4
+Subproject commit bb58e2f16a284aa34b840cbb19119b55bbebeb6e
diff --git a/README.txt b/README.txt
index 294428ab69..ba7121ea55 100644
--- a/README.txt
+++ b/README.txt
@@ -168,7 +168,7 @@ Downloading from Repositories
     instructions for cloning the core NuttX RTOS (corresponding to the nuttx
     tarball discussed above)::
 
-      git clone https://bitbucket.org/patacongo/nuttx.git nuttx
+      git clone https://bitbucket.org/nuttx/nuttx.git nuttx
 
     And the semi-optional apps/ application directory and be cloned like:
 
diff --git a/configs b/configs
index 2fee7d8536..19f150a0af 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 2fee7d85361d34343fa82807d45a62f37378ad5f
+Subproject commit 19f150a0af62724618f48f905ea63fac5eeae500
diff --git a/tools/kconfig2html.c b/tools/kconfig2html.c
index 81ba68ea45..295d4814e8 100644
--- a/tools/kconfig2html.c
+++ b/tools/kconfig2html.c
@@ -2634,7 +2634,7 @@ int main(int argc, char **argv, char **envp)
   body("</p>\n");
   body("<p>\n");
   body("  <b>Maintenance Note</b>.\n");
-  body("  This documentation was auto-generated using the <a href=\"https://bitbucket.org/patacongo/nuttx/src/master/tools/kconfig2html.c\">kconfig2html</a> tool\n");
+  body("  This documentation was auto-generated using the <a href=\"https://bitbucket.org/nuttx/nuttx/src/master/tools/kconfig2html.c\">kconfig2html</a> tool\n");
   body("  That tool analyzes the NuttX <code>Kconfig</code> files and generates this HTML document.\n");
   body("  This HTML document file should not be edited manually.\n");
   body("  In order to make changes to this document, you should instead modify the <code>Kconfig</code> file(s) that were used to generated this document and then execute the <code>kconfig2html</code> again to regenerate the HTML document file.\n");