diff --git a/request.go b/request.go
index 26d77fd1..11ea5e69 100644
--- a/request.go
+++ b/request.go
@@ -14,6 +14,7 @@ import (
     "reflect"
     "strconv"
     "strings"
+	"url"
 )
 
 type filedata struct {
@@ -24,7 +25,7 @@ type filedata struct {
 type Request struct {
     Method     string    // GET, POST, PUT, etc.
     RawURL     string    // The raw URL given in the request.
-    URL        *http.URL // Parsed URL.
+    URL        *url.URL // Parsed URL.
     Proto      string    // "HTTP/1.0"
     ProtoMajor int       // 1
     ProtoMinor int       // 0
@@ -104,7 +105,7 @@ func newRequestCgi(headers http.Header, body io.Reader) *Request {
     port := headers.Get("SERVER_PORT")
     proto := headers.Get("SERVER_PROTOCOL")
     rawurl := "http://" + host + ":" + port + path
-    url, _ := http.ParseURL(rawurl)
+    url, _ := url.Parse(rawurl)
     useragent := headers.Get("USER_AGENT")
     remoteAddr := headers.Get("REMOTE_ADDR")
     remotePort, _ := strconv.Atoi(headers.Get("REMOTE_PORT"))
@@ -146,9 +147,9 @@ func parseForm(m map[string][]string, query string) (err os.Error) {
 
         var key, value string
         var e os.Error
-        key, e = http.URLUnescape(kvPair[0])
+        key, e = url.QueryUnescape(kvPair[0])
         if e == nil && len(kvPair) > 1 {
-            value, e = http.URLUnescape(kvPair[1])
+            value, e = url.QueryUnescape(kvPair[1])
         }
         if e != nil {
             err = e
diff --git a/web.go b/web.go
index 49cb71ec..c03ab145 100644
--- a/web.go
+++ b/web.go
@@ -20,6 +20,7 @@ import (
     "strconv"
     "strings"
     "time"
+	"url"
 )
 
 type conn interface {
@@ -591,9 +592,9 @@ func fileExists(dir string) bool {
 func Urlencode(data map[string]string) string {
     var buf bytes.Buffer
     for k, v := range data {
-        buf.WriteString(http.URLEscape(k))
+        buf.WriteString(url.QueryEscape(k))
         buf.WriteByte('=')
-        buf.WriteString(http.URLEscape(v))
+        buf.WriteString(url.QueryEscape(v))
         buf.WriteByte('&')
     }
     s := buf.String()
diff --git a/web_test.go b/web_test.go
index c67e5044..9349fcea 100644
--- a/web_test.go
+++ b/web_test.go
@@ -12,6 +12,8 @@ import (
     "strconv"
     "strings"
     "testing"
+	"url"
+	//"dump"
 )
 
 func init() {
@@ -46,7 +48,7 @@ func buildTestResponse(buf *bytes.Buffer) *testResponse {
     response := testResponse{headers: make(map[string][]string), cookies: make(map[string]string)}
     s := buf.String()
 
-    contents := strings.Split(s, "\r\n\r\n", 2)
+    contents := strings.SplitN(s, "\r\n\r\n", 2)
 
     header := contents[0]
 
@@ -54,13 +56,14 @@ func buildTestResponse(buf *bytes.Buffer) *testResponse {
         response.body = contents[1]
     }
 
-    headers := strings.Split(header, "\r\n", -1)
+    headers := strings.SplitN(header, "\r\n", -1)
 
-    statusParts := strings.Split(headers[0], " ", 3)
+    statusParts := strings.SplitN(headers[0], " ", 3)
     response.statusCode, _ = strconv.Atoi(statusParts[1])
+	
 
     for _, h := range headers[1:] {
-        split := strings.Split(h, ":", 2)
+        split := strings.SplitN(h, ":", 2)
         name := strings.TrimSpace(split[0])
         value := strings.TrimSpace(split[1])
         if _, ok := response.headers[name]; !ok {
@@ -71,12 +74,11 @@ func buildTestResponse(buf *bytes.Buffer) *testResponse {
         copy(newheaders, response.headers[name])
         newheaders[len(newheaders)-1] = value
         response.headers[name] = newheaders
-
         //if the header is a cookie, set it
         if name == "Set-Cookie" {
             i := strings.Index(value, ";")
             cookie := value[0:i]
-            cookieParts := strings.Split(cookie, "=", 2)
+            cookieParts := strings.SplitN(cookie, "=", 2)
             response.cookies[strings.TrimSpace(cookieParts[0])] = strings.TrimSpace(cookieParts[1])
         }
     }
@@ -209,7 +211,7 @@ func buildTestRequest(method string, path string, body string, headers map[strin
     host := "127.0.0.1"
     port := "80"
     rawurl := "http://" + host + ":" + port + path
-    url, _ := http.ParseURL(rawurl)
+    url, _ := url.Parse(rawurl)
 
     proto := "HTTP/1.1"
     useragent := "web.go test framework"
@@ -347,7 +349,7 @@ func buildTestScgiRequest(method string, path string, body string, headers map[s
 
     return &buf
 }
-
+/*
 func TestScgi(t *testing.T) {
     for _, test := range tests {
         req := buildTestScgiRequest(test.method, test.path, test.body, make(map[string]string))
@@ -413,7 +415,7 @@ func TestScgiHead(t *testing.T) {
         }
     }
 }
-
+*/
 
 func buildFcgiKeyValue(key string, val string) []byte {
 
@@ -680,3 +682,4 @@ func TestCloseServer(t *testing.T) {
     }
 }
 */
+