diff --git a/website/Makefile b/website/Makefile
deleted file mode 100644
index e5c042138..000000000
--- a/website/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(GOROOT)/src/Make.inc
-
-TARG=camweb
-GOFILES=\
-	camweb.go\
-	logging.go\
-
-include $(GOROOT)/src/Make.cmd
-
diff --git a/website/camweb.go b/website/camweb.go
index ccfc8f10c..16e20a652 100644
--- a/website/camweb.go
+++ b/website/camweb.go
@@ -18,21 +18,22 @@ package main
 
 import (
 	"bytes"
-	"exec"
 	"flag"
 	"fmt"
-	"http"
-	"http/cgi"
 	"io"
 	"io/ioutil"
 	"log"
+	"net/http"
+	"net/http/cgi"
+	"net/http/httputil"
+	"net/url"
+	"old/template"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
-	"old/template"
 	"time"
-	"url"
 )
 
 const defaultAddr = ":31798" // default webserver address
@@ -146,7 +147,7 @@ func readTemplates() {
 	errorHtml = readTemplate("error.html")
 }
 
-func serveError(w http.ResponseWriter, r *http.Request, relpath string, err os.Error) {
+func serveError(w http.ResponseWriter, r *http.Request, relpath string, err error) {
 	contents := applyTemplate(errorHtml, "errorHtml", err) // err may contain an absolute path!
 	w.WriteHeader(http.StatusNotFound)
 	servePage(w, "File "+relpath, "", contents)
@@ -171,7 +172,7 @@ func mainHandler(rw http.ResponseWriter, req *http.Request) {
 		serveError(rw, req, relPath, err)
 		return
 	}
-	if fi.IsDirectory() {
+	if fi.IsDir() {
 		relPath += "/index.html"
 		absPath = filepath.Join(*root, "content", relPath)
 		fi, err = os.Lstat(absPath)
@@ -183,7 +184,7 @@ func mainHandler(rw http.ResponseWriter, req *http.Request) {
 	}
 
 	switch {
-	case fi.IsRegular():
+	case !fi.IsDir():
 		serveFile(rw, req, relPath, absPath)
 	}
 }
@@ -209,8 +210,8 @@ type gitwebHandler struct {
 }
 
 func (h *gitwebHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	if r.URL.RawPath == "/code/" ||
-		strings.HasPrefix(r.URL.RawPath, "/code/?") {
+	if r.URL.Path == "/code/" ||
+		strings.HasPrefix(r.URL.Path, "/code/?") {
 		h.Cgi.ServeHTTP(rw, r)
 	} else {
 		h.Static.ServeHTTP(rw, r)
@@ -230,7 +231,7 @@ type noWwwHandler struct {
 func (h *noWwwHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	// Some bots (especially Baidu) don't seem to respect robots.txt and swamp gitweb.cgi,
 	// so explicitly protect it from bots.
-	if strings.Contains(r.URL.RawPath, "/code/") && strings.Contains(r.URL.RawPath, "?") && isBot(r) {
+	if ru := r.URL.RequestURI(); strings.Contains(ru, "/code/") && strings.Contains(ru, "?") && isBot(r) {
 		http.Error(rw, "bye", http.StatusUnauthorized)
 		log.Printf("bot denied")
 		return
@@ -238,7 +239,7 @@ func (h *noWwwHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 
 	host := strings.ToLower(r.Host)
 	if host == "www.camlistore.org" {
-		http.Redirect(rw, r, "http://camlistore.org"+r.URL.RawPath, http.StatusFound)
+		http.Redirect(rw, r, "http://camlistore.org"+r.URL.RequestURI(), http.StatusFound)
 		return
 	}
 	h.Handler.ServeHTTP(rw, r)
@@ -246,7 +247,7 @@ func (h *noWwwHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 
 func fixupGitwebFiles() {
 	fi, err := os.Stat(*gitwebFiles)
-	if err != nil || !fi.IsDirectory() {
+	if err != nil || !fi.IsDir() {
 		if *gitwebFiles == "/usr/share/gitweb/static" {
 			// Old Debian/Ubuntu location
 			*gitwebFiles = "/usr/share/gitweb"
@@ -259,7 +260,7 @@ func main() {
 	readTemplates()
 
 	if *root == "" {
-		var err os.Error
+		var err error
 		*root, err = os.Getwd()
 		if err != nil {
 			log.Fatalf("Failed to getwd: %v", err)
@@ -281,7 +282,7 @@ func main() {
 	mux.Handle("/talks/", http.StripPrefix("/talks/", http.FileServer(http.Dir(filepath.Join(*root, "talks")))))
 
 	gerritUrl, _ := url.Parse(fmt.Sprintf("http://%s:8000/", *gerritHost))
-	var gerritHandler http.Handler = http.NewSingleHostReverseProxy(gerritUrl)
+	var gerritHandler http.Handler = httputil.NewSingleHostReverseProxy(gerritUrl)
 	if *httpsAddr != "" {
 		proxyHandler := gerritHandler
 		gerritHandler = http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
@@ -289,7 +290,7 @@ func main() {
 				proxyHandler.ServeHTTP(rw, req)
 				return
 			}
-			http.Redirect(rw, req, "https://camlistore.org"+req.URL.RawPath, http.StatusFound)
+			http.Redirect(rw, req, "https://camlistore.org"+req.URL.RequestURI(), http.StatusFound)
 		})
 	}
 	mux.Handle("/r/", gerritHandler)
@@ -322,7 +323,7 @@ func main() {
 		handler = NewLoggingHandler(handler, *logDir, *logStdout)
 	}
 
-	errch := make(chan os.Error)
+	errch := make(chan error)
 
 	httpServer := &http.Server{
 		Addr:         *httpAddr,
@@ -361,7 +362,7 @@ type fixUpGitwebUrls struct {
 // . Doesn't seem to be a bug in the CGI implementation, though, which
 // is what I'd originally suspected.
 func (fu *fixUpGitwebUrls) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	oldUrl := req.RawURL
+	oldUrl := req.URL.String()
 	newUrl := strings.Replace(oldUrl, "%3B", ";", -1)
 	if newUrl == oldUrl {
 		fu.handler.ServeHTTP(rw, req)
diff --git a/website/logging.go b/website/logging.go
index 7ee4dbd2f..2cab323ed 100644
--- a/website/logging.go
+++ b/website/logging.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"log"
+	"net/http"
 	"os"
-	"http"
 	"strings"
 	"time"
 )
@@ -12,7 +12,7 @@ import (
 type logRecord struct {
 	http.ResponseWriter
 
-	time                *time.Time
+	time                time.Time
 	ip, method, rawpath string
 	responseBytes       int64
 	responseStatus      int
@@ -47,10 +47,10 @@ func (h *logHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	lr := &logRecord{
-		time:           time.UTC(),
+		time:           time.Now().UTC(),
 		ip:             addr,
 		method:         r.Method,
-		rawpath:        r.URL.RawPath,
+		rawpath:        r.URL.RequestURI(),
 		userAgent:      r.UserAgent(),
 		referer:        r.Referer(),
 		responseStatus: http.StatusOK,
@@ -72,19 +72,19 @@ func (h *logHandler) logFromChannel() {
 
 		// [10/Oct/2000:13:55:36 -0700]
 		dateString := fmt.Sprintf("%02d/%s/%04d:%02d:%02d:%02d -0000",
-			lr.time.Day,
-			monthAbbr[lr.time.Month-1],
-			lr.time.Year,
-			lr.time.Hour, lr.time.Minute, lr.time.Second)
+			lr.time.Day(),
+			monthAbbr[lr.time.Month()-1],
+			lr.time.Year(),
+			lr.time.Hour(), lr.time.Minute(), lr.time.Second())
 
 		if h.dir != "" {
 			fileName := fmt.Sprintf("%s/%04d-%02d-%02d%s%02d.log", h.dir,
-				lr.time.Year, lr.time.Month, lr.time.Day, "h", lr.time.Hour)
+				lr.time.Year(), lr.time.Month(), lr.time.Day(), "h", lr.time.Hour())
 			if fileName > lastFileName {
 				if logFile != nil {
 					logFile.Close()
 				}
-				var err os.Error
+				var err error
 				logFile, err = os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
 				if err != nil {
 					log.Printf("Error opening %q: %v", fileName, err)
@@ -114,7 +114,7 @@ func (h *logHandler) logFromChannel() {
 	}
 }
 
-func (lr *logRecord) Write(p []byte) (int, os.Error) {
+func (lr *logRecord) Write(p []byte) (int, error) {
 	written, err := lr.ResponseWriter.Write(p)
 	lr.responseBytes += int64(written)
 	return written, err