diff --git a/docs/search.php b/docs/search.php
index bbd652aab6..7131062131 100644
--- a/docs/search.php
+++ b/docs/search.php
@@ -18,14 +18,13 @@
     <div id="body">
       <div id="content">
 <?php
-    $query = $HTTP_GET_VARS[ "query" ];
-    $scope = $HTTP_GET_VARS[ "scope" ];
-    // We handle only the first argument so far
     $query = $_GET['query'];
+    // We handle only the first argument so far
     $query = ltrim ($query);
     if (! $query) {
         echo "<h1 align='center'>Search the documentation on Libvir.org</h1>";
     }
+    $scope = $_GET['scope"'];
     if ($scope == NULL)
         $scope = "any";
     $scope = ltrim ($scope);
@@ -34,7 +33,7 @@
 
 ?>
 <p> The search service indexes the libvirt APIs and documentation as well as the libvir-list@redhat.com mailing-list archives. To use it simply provide a set of keywords:</p>
-<form action="<?php echo "$PHP_SELF", "?query=", rawurlencode($query) ?>"
+<form action="<?php echo "$_SERVER['PHP_SELF']", "?query=", rawurlencode($query) ?>"
       enctype="application/x-www-form-urlencoded" method="get">
   <input name="query" type="text" size="50" value="<?php echo $query?>"/>
   <select name="scope">