diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 391f35d..f47b15f 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -60,6 +60,7 @@
                  src/parse/parse.cc \
                  src/generate/t_generator.h \
                  src/generate/t_oop_generator.h \
+                 src/generate/t_html_generator.h \
                  src/windows/config.h \
                  src/windows/version.h
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f95428f..d26752b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -71,6 +71,7 @@
 EXTRA_DIST = \
 			as3 \
 			cocoa \
+			d \
 			delphi \
 			go \
 			javame \
diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index f2ffa45..05ee9cc 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -231,4 +231,6 @@
 EXTRA_DIST = \
 	DenseProtoTest.cpp \
 	ThriftTest_extras.cpp \
-	DebugProtoTest_extras.cpp
+	DebugProtoTest_extras.cpp \
+	concurrency \
+	processor
diff --git a/lib/d/Makefile.am b/lib/d/Makefile.am
index d76a07e..36a758c 100644
--- a/lib/d/Makefile.am
+++ b/lib/d/Makefile.am
@@ -178,4 +178,6 @@
 
 
 EXTRA_DIST = \
+	src \
+	test \ 
 	README
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index 5c4d0f4..d374cbc 100755
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -91,6 +91,10 @@
   lib/Thrift/Type/TMessageType.php \
   lib/Thrift/Type/TType.php
 
-EXTRA_DIST = src thrift_protocol.ini README.apache
+EXTRA_DIST = \
+	src \
+	lib \
+	thrift_protocol.ini \
+	README.apache
 
 MAINTAINERCLEANFILES = Makefile Makefile.in
diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am
index 3ad7781..2fd7f81 100755
--- a/lib/php/test/Makefile.am
+++ b/lib/php/test/Makefile.am
@@ -31,3 +31,5 @@
 clean-local:
 	$(RM) -r ./packages
 
+EXTRA_DIST = Test
+
diff --git a/test/Makefile.am b/test/Makefile.am
index e9d02e2..aaa497f 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -51,6 +51,7 @@
 	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
 
 EXTRA_DIST = \
+	test.sh \
 	cpp \
 	csharp \
 	hs \
@@ -69,6 +70,7 @@
 	DenseLinkingTest.thrift \
 	DocTest.thrift \
 	JavaBeansTest.thrift \
+	ManyOptionals.thrift \
 	ManyTypedefs.thrift \
 	OptionalRequiredTest.thrift \
 	SmallTest.thrift \