diff --git a/golang-f21-hostname.patch b/golang-f21-hostname.patch
new file mode 100644
index 0000000..acc3c6c
--- /dev/null
+++ b/golang-f21-hostname.patch
@@ -0,0 +1,13 @@
+Index: go/src/pkg/os/os_test.go
+===================================================================
+--- go.orig/src/pkg/os/os_test.go
++++ go/src/pkg/os/os_test.go
+@@ -842,7 +842,7 @@ func run(t *testing.T, cmd []string) str
+ 	if err != nil {
+ 		t.Fatal(err)
+ 	}
+-	p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
++	p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
+ 	if err != nil {
+ 		t.Fatal(err)
+ 	}