diff --git a/Makefile.am b/Makefile.am
index 6bc8754..26ddab6 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,8 @@
 
 EXTRA_DIST = \
 	.travis.yml \
+	bower.json \
+	composer.json \
 	contrib \
 	debian \
 	doc \
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index d6cf4c3..601fd32 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -21,10 +21,6 @@
 # Please see doc/old-thrift-license.txt in the Thrift distribution for
 # details.
 
-# Override Automake rule that forces .hh extension 
-am__yacc_c2h = sed -e s/cc$$/h/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
-           -e s/c++$$/h++/ -e s/c$$/h/
-
 AM_YFLAGS = -d
 LIBS =
 BUILT_SOURCES = thrifty.cc
@@ -42,6 +38,7 @@
                  src/globals.h \
                  src/main.h \
                  src/platform.h \
+                 src/logging.h \
                  src/md5.h \
                  src/parse/t_doc.h \
                  src/parse/t_type.h \
@@ -111,6 +108,7 @@
 
 EXTRA_DIST = \
              README.md \
+             CMakeLists.txt \
              $(WINDOWS_DIST)
 
 clean-local:
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0ff7fa0..5751a2c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -81,11 +81,12 @@
 # All of the libs that don't use Automake need to go in here
 # so they will end up in our release tarballs.
 EXTRA_DIST = \
-			as3 \
-			cocoa \
-			d \
-			delphi \
-			javame \
-			js \
-			ocaml \
-			st
+	as3 \
+	cocoa \
+	d \
+	delphi \
+	javame \
+	js \
+	ocaml \
+	st \
+	ts
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 7fcf9bd..ab9108a 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -100,7 +100,7 @@
 libthriftnb_la_SOURCES = src/thrift/server/TNonblockingServer.cpp \
                          src/thrift/async/TAsyncProtocolProcessor.cpp \
                          src/thrift/async/TEvhttpServer.cpp \
-                         src/thrift/async/TEvhttpClientChannel.cpp 
+                         src/thrift/async/TEvhttpClientChannel.cpp
 
 libthriftz_la_SOURCES = src/thrift/transport/TZlibTransport.cpp
 
@@ -230,7 +230,8 @@
              libthrift.vcxproj \
              libthrift.vcxproj.filters \
              libthriftnb.vcxproj \
-             libthriftnb.vcxproj.filters
+             libthriftnb.vcxproj.filters \
+             3rdparty.props
 
 EXTRA_DIST = \
              README.md \
diff --git a/lib/csharp/Makefile.am b/lib/csharp/Makefile.am
index cbc003b..069e48c 100644
--- a/lib/csharp/Makefile.am
+++ b/lib/csharp/Makefile.am
@@ -82,9 +82,9 @@
 
 # run csharp tests?
 # check:
-# 	cd test/ThriftTest && ./maketest.sh 
+# 	cd test/ThriftTest && ./maketest.sh
 # 	cd test/Multiplex && ./maketest.sh
-    
+
 EXTRA_DIST = \
              $(THRIFTCODE) \
              ThriftMSBuildTask \
@@ -93,4 +93,5 @@
              src/Thrift.WP7.csproj \
              src/Properties/AssemblyInfo.WP7.cs \
              src/Transport/TSilverlightSocket.cs \
-             test
+             test \
+             README.md
diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am
index 04c0639..759677a 100644
--- a/lib/d/Makefile.am
+++ b/lib/d/Makefile.am
@@ -17,7 +17,13 @@
 # under the License.
 #
 
-SUBDIRS = . test
+AUTOMAKE_OPTIONS = serial-tests
+
+SUBDIRS = .
+
+if WITH_TESTS
+SUBDIRS += test
+endif
 
 #
 # Enumeration of all the public and private modules.
diff --git a/lib/d/test/Makefile.am b/lib/d/test/Makefile.am
index 44f2d66..0482583 100755
--- a/lib/d/test/Makefile.am
+++ b/lib/d/test/Makefile.am
@@ -17,6 +17,7 @@
 # under the License.
 #
 
+AUTOMAKE_OPTIONS = serial-tests
 
 # Thrift compiler rules
 
diff --git a/lib/erl/Makefile.am b/lib/erl/Makefile.am
index 6550b52..c87f998 100644
--- a/lib/erl/Makefile.am
+++ b/lib/erl/Makefile.am
@@ -78,6 +78,12 @@
 maintainer-clean-local:
 	rm -rf ebin
 
-EXTRA_DIST = include src rebar rebar.config test
+EXTRA_DIST = \
+	include \
+	src \
+	rebar \
+	rebar.config \
+	test \
+	README.md
 
 MAINTAINERCLEANFILES = Makefile.in
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
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index ea01978..cbec7af 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -17,8 +17,6 @@
 # under the License.
 #
 
-EXTRA_DIST = build.xml build.properties src test
-
 export CLASSPATH
 
 all-local:
@@ -36,3 +34,9 @@
 check-local: all
 	$(ANT) $(ANT_FLAGS) test
 
+EXTRA_DIST = \
+	build.xml \
+	build.properties \
+	src \
+	test \
+	README.md
\ No newline at end of file
diff --git a/lib/lua/Makefile.am b/lib/lua/Makefile.am
index 1c42967..364a25d 100644
--- a/lib/lua/Makefile.am
+++ b/lib/lua/Makefile.am
@@ -19,21 +19,25 @@
 
 SUBDIRS = .
 
-lib_LTLIBRARIES = libluasocket.la \
-		  libluabpack.la \
-		  libluabitwise.la \
-		  liblualongnumber.la
+lib_LTLIBRARIES = \
+			libluasocket.la \
+			libluabpack.la \
+			libluabitwise.la \
+			liblualongnumber.la
 
-libluasocket_la_SOURCES =     src/luasocket.c \
-			   src/usocket.c
+libluasocket_la_SOURCES = \
+			src/luasocket.c \
+			src/usocket.c
+
+nobase_include_HEADERS = src/socket.h
 
 libluasocket_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
 libluasocket_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
 
-libluabpack_la_SOURCES = src/luabpack.c 
+libluabpack_la_SOURCES = src/luabpack.c
 
 libluabpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
-libluabpack_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm 
+libluabpack_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
 libluabpack_la_LIBADD = liblualongnumber.la
 
 libluabitwise_la_SOURCES = src/luabitwise.c
@@ -41,18 +45,19 @@
 libluabitwise_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
 libluabitwise_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
 
-liblualongnumber_la_SOURCES = src/lualongnumber.c \
-			      src/longnumberutils.c
+liblualongnumber_la_SOURCES = \
+		src/lualongnumber.c \
+		src/longnumberutils.c
 
 liblualongnumber_la_CPPFLAGS = $(AM_CPPFLAGS) -I/usr/include/lua5.2 -DLUA_COMPAT_MODULE
 liblualongnumber_la_LDFLAGS = $(AM_LDFLAGS) -llua5.2 -lm
 
 EXTRA_DIST = TBinaryProtocol.lua \
-	     TBufferedTransport.lua \
-	     TFramedTransport.lua \
-	     Thrift.lua \
-	     TMemoryBuffer.lua \
-	     TProtocol.lua \
-	     TServer.lua \
-	     TSocket.lua \
-	     TTransport.lua
\ No newline at end of file
+		TBufferedTransport.lua \
+		TFramedTransport.lua \
+		Thrift.lua \
+		TMemoryBuffer.lua \
+		TProtocol.lua \
+		TServer.lua \
+		TSocket.lua \
+		TTransport.lua
\ No newline at end of file
diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am
index 5e298d4..bd381bf 100755
--- a/lib/nodejs/Makefile.am
+++ b/lib/nodejs/Makefile.am
@@ -29,3 +29,10 @@
 
 clean-local:
 	$(RM) -r test/gen-nodejs
+
+EXTRA_DIST = \
+	examples \
+	lib \
+	package.json \
+	test \
+	README.md
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index 8e0caae..067ed69 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -52,4 +52,5 @@
 	lib/Thrift/Protocol.pm \
 	lib/Thrift/Server.pm \
 	lib/Thrift/Socket.pm \
-	lib/Thrift/Transport.pm
+	lib/Thrift/Transport.pm \
+	README.md
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index 2b6b5fa..c7fbad3 100755
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -116,10 +116,12 @@
   src/ext/thrift_protocol/config.w32 \
   src/ext/thrift_protocol/php_thrift_protocol.cpp \
   src/ext/thrift_protocol/php_thrift_protocol.h \
+  src/ext/thrift_protocol/run-tests.php \
   src/Thrift.php \
   src/TStringUtils.php \
   thrift_protocol.ini \
-  README.apache.md
+  README.apache.md \
+  README.md
 
 MAINTAINERCLEANFILES = \
   Makefile \
diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am
index 1292b81..1119d3f 100755
--- a/lib/php/test/Makefile.am
+++ b/lib/php/test/Makefile.am
@@ -32,5 +32,7 @@
 clean-local:
 	$(RM) -r ./packages
 
-EXTRA_DIST = Test
+EXTRA_DIST = \
+	Test \
+	phpunit.xml
 
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index e33bf13..a504b5c 100755
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -18,7 +18,6 @@
 #
 .NOTPARALLEL:
 DESTDIR ?= /
-EXTRA_DIST = setup.py setup.cfg src compat
 
 all-local:
 	$(PYTHON) setup.py build
@@ -34,3 +33,10 @@
 	$(RM) -r build
 
 check-local: all
+
+EXTRA_DIST = \
+	compat \
+	setup.py \
+	setup.cfg \
+	src \
+	README.md
diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index 300f676..2d0c12e 100755
--- a/lib/rb/Makefile.am
+++ b/lib/rb/Makefile.am
@@ -17,16 +17,6 @@
 # under the License.
 #
 
-EXTRA_DIST = \
-	Rakefile \
-	Gemfile \
-	thrift.gemspec \
-	lib \
-	ext \
-	benchmark \
-	script \
-	spec
-
 DESTDIR ?= /
 
 if HAVE_BUNDLER
@@ -47,3 +37,13 @@
 
 endif
 
+EXTRA_DIST = \
+	Rakefile \
+	Gemfile \
+	thrift.gemspec \
+	lib \
+	ext \
+	benchmark \
+	script \
+	spec \
+	README.md
diff --git a/test/Makefile.am b/test/Makefile.am
index 75630cc..dddad11 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -56,9 +56,13 @@
 	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
 
 EXTRA_DIST = \
+	keys \
 	test.sh \
+	test.py \
+	tests.json \
 	cpp \
 	hs \
+	lua \
 	ocaml \
 	perl \
 	php \
@@ -77,8 +81,12 @@
 	JavaBeansTest.thrift \
 	ManyOptionals.thrift \
 	ManyTypedefs.thrift \
+	NameConflictTest.thrift \
 	OptionalRequiredTest.thrift \
+	Recursive.thrift \
+	ReuseObjects.thrift \
 	SmallTest.thrift \
 	StressTest.thrift \
 	ThriftTest.thrift \
-	FastbinaryTest.py
+	FastbinaryTest.py \
+	README.md
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index a23402e..59450ce 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -27,7 +27,7 @@
 	grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
 
 # Thrift for GO has problems with complex map keys: THRIFT-2063
-gopath: $(THRIFT) ThriftTest.thrift 
+gopath: $(THRIFT) ThriftTest.thrift
 	mkdir src/gen
 	$(THRIFTCMD) ThriftTest.thrift
 	$(THRIFTCMD) ../StressTest.thrift
@@ -54,3 +54,6 @@
 	GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
 	GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
 
+EXTRA_DIST = \
+	src/bin \
+	src/common
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index ccc9c46..a010523 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -64,6 +64,7 @@
 # Any folders or files not listed above being added to SUBDIR need to be placed here in
 # EXTRA_DIST to be included in the release
 EXTRA_DIST = \
+	as3 \
 	csharp \
 	d \
 	delphi \
@@ -74,4 +75,5 @@
 	perl \
 	php \
 	shared.thrift \
-	tutorial.thrift
+	tutorial.thrift \
+	README.md
diff --git a/tutorial/java/Makefile.am b/tutorial/java/Makefile.am
index aa8b80c..95908b1 100755
--- a/tutorial/java/Makefile.am
+++ b/tutorial/java/Makefile.am
@@ -41,4 +41,5 @@
 
 EXTRA_DIST = \
 	build.xml \
-	src
+	src \
+	README.md