diff --git a/lib/go/Makefile.am b/lib/go/Makefile.am
index 05369b9..be2a2e5 100644
--- a/lib/go/Makefile.am
+++ b/lib/go/Makefile.am
@@ -24,17 +24,17 @@
 endif
 
 install:
-    @echo '##############################################################'
-    @echo '##############################################################'
-    @echo 'The Go client library should be installed via "go get", please see /lib/go/README.md'
-    @echo '##############################################################'
-    @echo '##############################################################'
+	@echo '##############################################################'
+	@echo '##############################################################'
+	@echo 'The Go client library should be installed via "go get", please see /lib/go/README.md'
+	@echo '##############################################################'
+	@echo '##############################################################'
 
 check-local:
-    $(GO) test ./thrift
+	$(GO) test ./thrift
 
 all-local: check-local
 
 EXTRA_DIST = \
-    thrift \
-    README.md
+	thrift \
+	README.md
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index b319d4f..c13ba74 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -22,55 +22,55 @@
 
 # Thrift for GO has problems with complex map keys: THRIFT-2063
 gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) \
-                IncludesTest.thrift \
-                NamespacedTest.thrift \
-                MultiplexedProtocolTest.thrift \
-                OnewayTest.thrift \
-                OptionalFieldsTest.thrift \
-                ServicesTest.thrift \
-                GoTagTest.thrift \
-                TypedefFieldTest.thrift \
-                RefAnnotationFieldsTest.thrift
-    mkdir -p gopath/src
-    grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
-    $(THRIFT) -r IncludesTest.thrift
-    $(THRIFT) BinaryKeyTest.thrift
-    $(THRIFT) MultiplexedProtocolTest.thrift
-    $(THRIFT) OnewayTest.thrift
-    $(THRIFT) OptionalFieldsTest.thrift
-    $(THRIFT) ServicesTest.thrift
-    $(THRIFT) GoTagTest.thrift
-    $(THRIFT) TypedefFieldTest.thrift
-    $(THRIFT) RefAnnotationFieldsTest.thrift
-    GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock
-    ln -nfs ../../../thrift gopath/src/thrift
-    ln -nfs ../../tests gopath/src/tests
-    touch gopath
+				IncludesTest.thrift \
+				NamespacedTest.thrift \
+				MultiplexedProtocolTest.thrift \
+				OnewayTest.thrift \
+				OptionalFieldsTest.thrift \
+				ServicesTest.thrift \
+				GoTagTest.thrift \
+				TypedefFieldTest.thrift \
+				RefAnnotationFieldsTest.thrift
+	mkdir -p gopath/src
+	grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
+	$(THRIFT) -r IncludesTest.thrift
+	$(THRIFT) BinaryKeyTest.thrift
+	$(THRIFT) MultiplexedProtocolTest.thrift
+	$(THRIFT) OnewayTest.thrift
+	$(THRIFT) OptionalFieldsTest.thrift
+	$(THRIFT) ServicesTest.thrift
+	$(THRIFT) GoTagTest.thrift
+	$(THRIFT) TypedefFieldTest.thrift
+	$(THRIFT) RefAnnotationFieldsTest.thrift
+	GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock
+	ln -nfs ../../../thrift gopath/src/thrift
+	ln -nfs ../../tests gopath/src/tests
+	touch gopath
 
 check: gopath
-    GOPATH=`pwd`/gopath $(GO) build \
-                includestest \
-                binarykeytest \
-                servicestest \
-                typedeffieldtest \
-                refannotationfieldstest
-    GOPATH=`pwd`/gopath $(GO) test thrift tests
+	GOPATH=`pwd`/gopath $(GO) build \
+				includestest \
+				binarykeytest \
+				servicestest \
+				typedeffieldtest \
+				refannotationfieldstest
+	GOPATH=`pwd`/gopath $(GO) test thrift tests
 
 clean-local:
-    $(RM) -r gopath ThriftTest.thrift gen-go
+	$(RM) -r gopath ThriftTest.thrift gen-go
 
 client: stubs
-    $(GO) run TestClient.go
+	$(GO) run TestClient.go
 
 EXTRA_DIST = \
-    tests \
-    BinaryKeyTest.thrift \
-    GoTagTest.thrift \
-    IncludesTest.thrift \
-    MultiplexedProtocolTest.thrift \
-    NamespacedTest.thrift \
-    OnewayTest.thrift \
-    OptionalFieldsTest.thrift \
-    RefAnnotationFieldsTest.thrift \
-    ServicesTest.thrift \
-    TypedefFieldTest.thrift
+	tests \
+	BinaryKeyTest.thrift \
+	GoTagTest.thrift \
+	IncludesTest.thrift \
+	MultiplexedProtocolTest.thrift \
+	NamespacedTest.thrift \
+	OnewayTest.thrift \
+	OptionalFieldsTest.thrift \
+	RefAnnotationFieldsTest.thrift \
+	ServicesTest.thrift \
+	TypedefFieldTest.thrift