diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index bb386cf..be2a2e5 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -17,8 +17,10 @@
 # under the License.
 #
 
+SUBDIRS = .
+
 if WITH_TESTS
-SUBDIRS = test
+SUBDIRS += test
 endif
 
 install:
@@ -34,4 +36,5 @@
 all-local: check-local
 
 EXTRA_DIST = \
-	thrift
+	thrift \
+	README.md
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index 43f17a1..ec4011b 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -63,5 +63,14 @@
 	$(GO) run TestClient.go
 
 EXTRA_DIST = \
+	tests \
+	BinaryKeyTest.thrift \
+	GoTagTest.thrift \
 	IncludesTest.thrift \
-	NamespacedTest.thrift
+	MultiplexedProtocolTest.thrift \
+	NamespacedTest.thrift \
+	OnewayTest.thrift \
+	OptionalFieldsTest.thrift \
+	RefAnnotationFieldsTest.thrift \
+	ServicesTest.thrift \
+	TypedefFieldTest.thrift