diff --git a/include/layout.inc b/include/layout.inc
index df7c1a9ec..ec7f1e3e3 100644
--- a/include/layout.inc
+++ b/include/layout.inc
@@ -153,7 +153,7 @@ function site_header($title = '', $config = array())
     <option value="quickref" selected="selected">function list</option>
     <option value="all"      >all php.net sites</option>
     <option value="local"    >this mirror only</option>
-    <option value="manual"   >online documentation [en]</option>
+    <option value="manual"   >online documentation</option>
     <option value="bugdb"    >bug database</option>
     <option value="news_archive">Site News Archive</option>
     <option value="changelogs">All Changelogs</option>
@@ -509,7 +509,7 @@ function commonHeader($title="",$dont_enclose=0,$headers_gone=0) {
  <option value="quickref" selected="selected">function list</option>
  <option value="all"      >all php.net sites</option>
  <option value="local"    >this mirror only</option>
- <option value="manual"   >online documentation [en]</option>
+ <option value="manual"   >online documentation</option>
  <option value="bugdb"    >bug database</option>
  <option value="news_archive">Site News Archive</option>
  <option value="changelogs">All Changelogs</option>
diff --git a/search.php b/search.php
index 4b26fbae7..575fcf21e 100644
--- a/search.php
+++ b/search.php
@@ -75,7 +75,7 @@ if (!empty($_FORM['pattern'])) {
             }
 
         case "manual":
-            mirror_redirect($MYSITE . "results.php?q=inurl:manual/en+{$ucp}&p=local");
+            mirror_redirect($MYSITE . "results.php?q={$ucp}&p=manual&lang=$LANG");
             break;
 
         case "news_archive":
diff --git a/searchbar.php b/searchbar.php
index b45067e65..de5ebddd0 100644
--- a/searchbar.php
+++ b/searchbar.php
@@ -38,7 +38,7 @@ echo <<<SEARCHBAR_END
    <option value="quickref" selected="selected">function list</option>
    <option value="all"      >all php.net sites</option>
    <option value="local"    >this mirror only</option>
-   <option value="manual"   >online documentation [en]</option>
+   <option value="manual"   >online documentation</option>
    <option value="bugdb"    >bug database</option>
    <option value="news_archive">Site News Archive</option>
    <option value="changelogs">All Changelogs</option>