diff --git a/cmd/serve/restic/restic.go b/cmd/serve/restic/restic.go
index 4ac4dfc17..113036f48 100644
--- a/cmd/serve/restic/restic.go
+++ b/cmd/serve/restic/restic.go
@@ -1,4 +1,7 @@
 // Package restic serves a remote suitable for use with restic
+
+// +build go1.9
+
 package restic
 
 import (
diff --git a/cmd/serve/restic/restic_appendonly_test.go b/cmd/serve/restic/restic_appendonly_test.go
index 00aa4092d..8f35b28f7 100644
--- a/cmd/serve/restic/restic_appendonly_test.go
+++ b/cmd/serve/restic/restic_appendonly_test.go
@@ -1,3 +1,5 @@
+// +build go1.9
+
 package restic
 
 import (
diff --git a/cmd/serve/restic/restic_test.go b/cmd/serve/restic/restic_test.go
index d0da8eb1f..d139f6ea3 100644
--- a/cmd/serve/restic/restic_test.go
+++ b/cmd/serve/restic/restic_test.go
@@ -1,5 +1,8 @@
 // Serve restic tests set up a server and run the integration tests
 // for restic against it.
+
+// +build go1.9
+
 package restic
 
 import (
diff --git a/cmd/serve/restic/restic_unsupported.go b/cmd/serve/restic/restic_unsupported.go
new file mode 100644
index 000000000..892334116
--- /dev/null
+++ b/cmd/serve/restic/restic_unsupported.go
@@ -0,0 +1,11 @@
+// Build for unsupported platforms to stop go complaining
+// about "no buildable Go source files "
+
+// +build !go1.9
+
+package restic
+
+import "github.com/spf13/cobra"
+
+// Command definition is nil to show not implemented
+var Command *cobra.Command = nil
diff --git a/cmd/serve/restic/stdio_conn.go b/cmd/serve/restic/stdio_conn.go
index 164255615..6c82f1c68 100644
--- a/cmd/serve/restic/stdio_conn.go
+++ b/cmd/serve/restic/stdio_conn.go
@@ -1,3 +1,5 @@
+// +build go1.9
+
 package restic
 
 import (
diff --git a/cmd/serve/restic/stdio_conn_pre_go1.10.go b/cmd/serve/restic/stdio_conn_pre_go1.10.go
index 32500fa8a..9769230ef 100644
--- a/cmd/serve/restic/stdio_conn_pre_go1.10.go
+++ b/cmd/serve/restic/stdio_conn_pre_go1.10.go
@@ -1,4 +1,4 @@
-//+build !go1.10
+//+build go1.9,!go1.10
 
 // Fallback deadline setting for pre go1.10
 
diff --git a/cmd/serve/serve.go b/cmd/serve/serve.go
index 5eae2b232..3c3e455f3 100644
--- a/cmd/serve/serve.go
+++ b/cmd/serve/serve.go
@@ -16,7 +16,9 @@ func init() {
 	if webdav.Command != nil {
 		Command.AddCommand(webdav.Command)
 	}
-	Command.AddCommand(restic.Command)
+	if restic.Command != nil {
+		Command.AddCommand(restic.Command)
+	}
 	if ftp.Command != nil {
 		Command.AddCommand(ftp.Command)
 	}