diff --git a/bootstrap b/bootstrap
index 5fcf610..bf39035 100755
--- a/bootstrap
+++ b/bootstrap
@@ -134,10 +134,10 @@ while (true) {
           $uri .= "&";
         }
 
-        $uri .= $name;
+        $uri .= rawurlencode($name) . '=';
 
         if ($value != '') {
-          $uri .= '=' . $value;
+          $uri .= rawurlencode($value);
         }
       }
     }