diff --git a/docs/website/contribute.html b/docs/website/contribute.html
index 17ed26fffd..c68a8a7653 100644
--- a/docs/website/contribute.html
+++ b/docs/website/contribute.html
@@ -26,7 +26,7 @@ There are many different ways to contribute:</p>
 </ul>
 
 <p>For more details on these topics, check out the
-<a href="http://buildroot.uclibc.org/downloads/manual/manual.html#_contributing_to_buildroot">
+<a href="http://buildroot.org/manual.html#_contributing_to_buildroot">
 Contributing to buildroot</a> chapter in the Buildroot manual. Thanks for your help!</p>
 
 <p>If you need any support yourself, have a look at <a href="./support.html">
diff --git a/docs/website/docs.html b/docs/website/docs.html
index 3bd31723ab..6edc989cf6 100644
--- a/docs/website/docs.html
+++ b/docs/website/docs.html
@@ -11,7 +11,7 @@ things. It is available as:</p>
 
 <h4>Latest stable release</h4>
 <ul>
-  <li><a href="/downloads/manual/manual.html">Online HTML</a></li>
+  <li><a href="/manual.html">Online HTML</a></li>
   <li><a href="/downloads/manual/manual.pdf">PDF document</a></li>
   <li><a href="/downloads/manual/manual.text">ASCII text</a></li>
 </ul>
diff --git a/docs/website/manual.html b/docs/website/manual.html
new file mode 120000
index 0000000000..bd5552e524
--- /dev/null
+++ b/docs/website/manual.html
@@ -0,0 +1 @@
+/downloads/manual/manual.html
\ No newline at end of file
diff --git a/package/Config.in b/package/Config.in
index eb28ccbb14..783fbb48af 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1373,18 +1373,17 @@ endif
 endmenu
 
 menu "Package managers"
-comment "-----------------------------------------------------"
-comment "Please note:                                         "
-comment "- Buildroot does *not* generate binary packages,     "
-comment "- Buildroot does *not* install any package database. "
-comment "*                                                    "
-comment "It is up to you to provide those by yourself if you  "
-comment "want to use any of those package managers.           "
-comment "*                                                    "
-comment "See the manual:                                      "
-comment "http://buildroot.org/downloads/manual/manual.html#faq"
-comment "-no-binary-packages                                  "
-comment "-----------------------------------------------------"
+comment "-------------------------------------------------------"
+comment "Please note:                                           "
+comment "- Buildroot does *not* generate binary packages,       "
+comment "- Buildroot does *not* install any package database.   "
+comment "*                                                      "
+comment "It is up to you to provide those by yourself if you    "
+comment "want to use any of those package managers.             "
+comment "*                                                      "
+comment "See the manual:                                        "
+comment "http://buildroot.org/manual.html#faq-no-binary-packages"
+comment "-------------------------------------------------------"
 	source "package/ipkg/Config.in"
 	source "package/opkg/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/package/rpi-firmware/config.txt b/package/rpi-firmware/config.txt
index aa8d2ab5dd..58cc966a87 100644
--- a/package/rpi-firmware/config.txt
+++ b/package/rpi-firmware/config.txt
@@ -1,7 +1,7 @@
 # Please note that this is only a sample, we recommend you to change it to fit
 # your needs.
 # You should override this file using a post-build script.
-# See http://buildroot.org/downloads/manual/manual.html#rootfs-custom
+# See http://buildroot.org/manual.html#rootfs-custom
 # and http://elinux.org/RPiconfig for a description of config.txt syntax
 
 kernel=zImage