diff --git a/lib/go/.gitignore b/lib/go/.gitignore
new file mode 100644
index 000000000..a589ec566
--- /dev/null
+++ b/lib/go/.gitignore
@@ -0,0 +1,3 @@
+*.8
+*.6
+*/_obj/*
diff --git a/server/go/blobref/Makefile b/lib/go/blobref/Makefile
similarity index 100%
rename from server/go/blobref/Makefile
rename to lib/go/blobref/Makefile
diff --git a/server/go/blobref/blobref.go b/lib/go/blobref/blobref.go
similarity index 100%
rename from server/go/blobref/blobref.go
rename to lib/go/blobref/blobref.go
diff --git a/server/go/blobref/blobref_test.go b/lib/go/blobref/blobref_test.go
similarity index 100%
rename from server/go/blobref/blobref_test.go
rename to lib/go/blobref/blobref_test.go
diff --git a/server/go/jsonsign/Makefile b/lib/go/jsonsign/Makefile
similarity index 100%
rename from server/go/jsonsign/Makefile
rename to lib/go/jsonsign/Makefile
diff --git a/server/go/jsonsign/keys.go b/lib/go/jsonsign/keys.go
similarity index 100%
rename from server/go/jsonsign/keys.go
rename to lib/go/jsonsign/keys.go
diff --git a/server/go/jsonsign/sign.go b/lib/go/jsonsign/sign.go
similarity index 100%
rename from server/go/jsonsign/sign.go
rename to lib/go/jsonsign/sign.go
diff --git a/server/go/jsonsign/verify.go b/lib/go/jsonsign/verify.go
similarity index 100%
rename from server/go/jsonsign/verify.go
rename to lib/go/jsonsign/verify.go
diff --git a/server/go/Makefile b/server/go/Makefile
index 9fb5ee14c..eae198084 100644
--- a/server/go/Makefile
+++ b/server/go/Makefile
@@ -1,19 +1,19 @@
 all:
+	make -C openpgp
+	make -C ../../lib/go/blobref install
+	make -C ../../lib/go/jsonsign install
 	make -C auth install
 	make -C httputil install
-	make -C blobref install
 	make -C webserver install
-	make -C jsonsign install
-	make -C openpgp
 	make -C blobserver install
 	make -C sigserver install
 
 clean:
+	make -C openpgp clean
+	make -C ../../lib/go/blobref clean
+	make -C ../../lib/go/jsonsign clean
 	make -C auth clean
 	make -C httputil clean
-	make -C blobref clean
 	make -C webserver clean
-	make -C jsonsign clean
-	make -C openpgp clean
 	make -C blobserver clean
 	make -C sigserver clean