diff --git a/validator_watcher_copy_test.go b/validator_watcher_copy_test.go
index fa04cb9..68c4cb7 100644
--- a/validator_watcher_copy_test.go
+++ b/validator_watcher_copy_test.go
@@ -1,5 +1,4 @@
-// +build go1.3
-// +build !plan9,!solaris,!windows
+// +build go1.3,!plan9,!solaris,!windows
 
 // Turns out you can't copy over an existing file on Windows.
 
diff --git a/validator_watcher_test.go b/validator_watcher_test.go
index f220ea2..70eaa10 100644
--- a/validator_watcher_test.go
+++ b/validator_watcher_test.go
@@ -1,5 +1,4 @@
-// +build go1.3
-// +build !plan9,!solaris
+// +build go1.3,!plan9,!solaris
 
 package main
 
diff --git a/watcher.go b/watcher.go
index d8e073f..fa8f03f 100644
--- a/watcher.go
+++ b/watcher.go
@@ -1,5 +1,4 @@
-// +build go1.3
-// +build !plan9,!solaris
+// +build go1.3,!plan9,!solaris
 
 package main
 
diff --git a/watcher_unsupported.go b/watcher_unsupported.go
index d94e11e..d65c863 100644
--- a/watcher_unsupported.go
+++ b/watcher_unsupported.go
@@ -1,5 +1,4 @@
-// +build go1.1
-// +build plan9,solaris
+// +build !go1.3 plan9 solaris
 
 package main
 
@@ -7,7 +6,7 @@ import (
 	"log"
 )
 
-func WatchForUpdates(filename string, action func()) bool {
+func WatchForUpdates(filename string, done <-chan bool, action func()) bool {
 	log.Printf("file watching not implemented on this platform")
 	return false
 }