diff --git a/Makefile.am b/Makefile.am
index cebfc6f..0a677d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,5 +3,5 @@
 SUBDIRS = compiler/cpp lib test
 ## Don't run make dist from a subversion working copy
 ## because it will pull in your .svn directories.
-EXTRA_DIST = bootstrap.sh cleanup.sh doc test tutorial contrib \
-             thrift.el thrift.vim thrift.bnf CONTRIBUTORS LICENSE
+EXTRA_DIST = bootstrap.sh cleanup.sh print_version.sh doc tutorial contrib \
+             CONTRIBUTORS LICENSE
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 4592008..7d3d886 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -75,6 +75,7 @@
                          src/concurrency/Thread.h \
                          src/concurrency/ThreadManager.h \
                          src/concurrency/TimerManager.h \
+                         src/concurrency/FunctionRunner.h \
                          src/concurrency/Util.h
 
 include_protocoldir = $(include_thriftdir)/protocol
@@ -102,6 +103,7 @@
                          src/transport/TTransportException.h \
                          src/transport/TTransportUtils.h \
                          src/transport/TBufferTransports.h \
+                         src/transport/TShortReadTransport.h \
                          src/transport/TZlibTransport.h
 
 include_serverdir = $(include_thriftdir)/server
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index ae8a4d3..b31b0cd 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = build.xml src LICENSE
+EXTRA_DIST = build.xml src test LICENSE
 
 all-local:
 	$(ANT)
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index d942002..a83966e 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -20,7 +20,8 @@
 	fi
 	rm -f Makefile-perl.mk.old
 
-EXTRA_DIST = MANIFEST \
+EXTRA_DIST = \
+	LICENSE \
 	Makefile.PL \
 	test.pl \
 	lib/Thrift.pm \
diff --git a/lib/rb/Makefile.am b/lib/rb/Makefile.am
index 07fc5c6..5c6f078 100644
--- a/lib/rb/Makefile.am
+++ b/lib/rb/Makefile.am
@@ -1,4 +1,13 @@
-EXTRA_DIST = setup.rb lib ext
+EXTRA_DIST = \
+	CHANGELOG \
+	LICENSE \
+	Rakefile \
+	Manifest \
+	setup.rb \
+	lib \
+	ext \
+	benchmark \
+	spec
 
 all-local:
 	$(RUBY) setup.rb config
diff --git a/test/Makefile.am b/test/Makefile.am
index cc92ce0..288ea37 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -118,3 +118,30 @@
 
 clean-local:
 	$(RM) -r gen-cpp
+
+EXTRA_DIST = \
+	cpp \
+	threads \
+	csharp \
+	py \
+	rb \
+	perl \
+	php \
+	erl \
+	hs \
+	ocaml \
+	AnnotationTest.thrift \
+	BrokenConstants.thrift \
+	ConstantsDemo.thrift \
+	DebugProtoTest.thrift \
+	DenseLinkingTest.thrift \
+	DocTest.thrift \
+	JavaBeansTest.thrift \
+	ManyTypedefs.thrift \
+	OptionalRequiredTest.thrift \
+	SmallTest.thrift \
+	StressTest.thrift \
+	ThriftTest.thrift \
+	ZlibTest.cpp \
+	DenseProtoTest.cpp \
+	FastbinaryTest.py