diff --git a/tools/serve b/tools/serve
index 9c74d8e..baf68d1 100755
--- a/tools/serve
+++ b/tools/serve
@@ -1,17 +1,3 @@
-#!/usr/bin/python
+#!/bin/bash
 
-import SimpleHTTPServer
-import SocketServer
-import os
-
-PORT = 8000
-
-public_dir = os.path.join(os.path.dirname(__file__), '..', 'public')
-os.chdir(public_dir)
-
-Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-Handler.extensions_map.update({
-    '': 'text/html',
-});
-httpd = SocketServer.TCPServer(("", PORT), Handler)
-httpd.serve_forever()
+exec go run tools/serve.go
diff --git a/tools/serve.go b/tools/serve.go
new file mode 100644
index 0000000..c54f79b
--- /dev/null
+++ b/tools/serve.go
@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+	"net/http"
+)
+
+func main() {
+	port := "8000"
+	publicDir := "public"
+	fmt.Printf("Serving Go by Example at http://127.0.0.1:%s\n", port)
+
+	// Simple static webserver:
+	http.ListenAndServe(":"+port, http.FileServer(http.Dir(publicDir)))
+}