diff --git a/alpine/packages/Makefile b/alpine/packages/Makefile
index b2166e303..cf7ef7842 100644
--- a/alpine/packages/Makefile
+++ b/alpine/packages/Makefile
@@ -3,8 +3,14 @@ DEPS=proxy diagnostics transfused tap-vsockd docker nc-vsock vsudd 9pmount-vsock
 
 default: $(DEPS)
 
-$(DEPS):
+$(DEPS): lint
 	$(MAKE) -C $@
 
+lint:
+	# gofmt
+	@test -z "$$(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)"
+	# govet
+	@test -z "$$(go tool vet -printf=false . 2>&1 | grep -v vendor/ | tee /dev/stderr)"
+
 clean:
 	for f in $(DEPS); do $(MAKE) -C $$f clean; done
diff --git a/alpine/packages/vsudd/main.go b/alpine/packages/vsudd/main.go
index 30b4d9fbf..d1461e94e 100644
--- a/alpine/packages/vsudd/main.go
+++ b/alpine/packages/vsudd/main.go
@@ -188,7 +188,7 @@ func handleOneIn(connid int, conn vConn, sock string) {
 	var docker *net.UnixConn
 	var err error
 
-	docker, err = net.DialUnix("unix", nil, &net.UnixAddr{sock, "unix"})
+	docker, err = net.DialUnix("unix", nil, &net.UnixAddr{Name: sock, Net: "unix"})
 
 	if err != nil {
 		// If the forwarding program has broken then close and continue
diff --git a/alpine/packages/vsudd/vsyslog.go b/alpine/packages/vsudd/vsyslog.go
index 55de24ad1..35d3ae2aa 100644
--- a/alpine/packages/vsudd/vsyslog.go
+++ b/alpine/packages/vsudd/vsyslog.go
@@ -158,7 +158,7 @@ func handleSyslogForward(cfg string) {
 		/* Try and carry on... */
 	}
 
-	l, err := net.ListenUnixgram("unixgram", &net.UnixAddr{usock, "unixgram"})
+	l, err := net.ListenUnixgram("unixgram", &net.UnixAddr{Name: usock, Net: "unixgram"})
 	if err != nil {
 		console.Fatalf("Failed to listen to unixgram:%s: %s", usock, err)
 	}