diff --git a/Makefile.am b/Makefile.am
index b5f36ef..f4548e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,5 +33,12 @@
 print-version:
 	@echo $(VERSION)
 
-EXTRA_DIST = doc tutorial contrib \
-             CONTRIBUTORS LICENSE CHANGES DISCLAIMER NOTICE
+EXTRA_DIST = \
+ 			doc \
+			tutorial \
+			contrib \
+			CONTRIBUTORS \
+			LICENSE \
+			CHANGES \
+			DISCLAIMER \
+			NOTICE
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index f69ffb2..a5723a3 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -59,7 +59,9 @@
                  src/parse/t_const_value.h \
                  src/parse/parse.cc \
                  src/generate/t_generator.h \
-                 src/generate/t_oop_generator.h
+                 src/generate/t_oop_generator.h \
+                 src/windows/config.h \
+                 src/windows/version.h
 
 # Specific client generator source
 thrift_SOURCES += src/generate/t_c_glib_generator.cc \
@@ -93,7 +95,13 @@
 libparse_a_SOURCES = src/thrifty.yy \
                      src/thriftl.ll
 
-EXTRA_DIST = README
+WINDOWS_DIST = \
+             compiler.sln \
+             compiler.vcxproj \
+             compiler.vcxproj.filters
+
+EXTRA_DIST = \
+             $(WINDOWS_DIST)
 
 clean-local:
 	$(RM) thriftl.cc thrifty.cc thrifty.h version.h
diff --git a/compiler/cpp/README b/compiler/cpp/README
index fb100a8..e69de29 100644
--- a/compiler/cpp/README
+++ b/compiler/cpp/README
@@ -1,39 +0,0 @@
-Thrift Code Compiler
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Thrift Code Compiler
-====================
-
-This compiler takes thrift files as input and generates output code across
-various programming languages. To build and install it, do this:
-
-  ./bootstrap.sh
-  ./configure
-  make
-  sudo make install
-
-It requires some form of LEX and YACC to be installed, which should be
-picked up by autoconf.
-
-Not much else to report here. You'll have to look at the code to get your
-questions answered. Or just run the executable after you build and take
-a look at the usage message.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3b4c8ba..cd62d19 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -65,9 +65,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 = \
-  cocoa \
-  ocaml \
-  js \
-  as3 \
-  st \
-  go
+			as3 \
+			cocoa \
+			delphi \
+			go \
+			javame \
+			js \
+			nodejs \
+			ocaml \
+			st
diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
index 5b66818..ce61404 100644
--- a/lib/c_glib/Makefile.am
+++ b/lib/c_glib/Makefile.am
@@ -86,6 +86,7 @@
 
 EXTRA_DIST = \
              README \
+             test/glib.suppress \
              thrift_c_glib.pc.in
 
 CLEANFILES = \
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index a61d70f..f526479 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -48,6 +48,7 @@
 
 libthrift_la_SOURCES = src/Thrift.cpp \
                        src/TApplicationException.cpp \
+                       src/VirtualProfiling.cpp \
                        src/concurrency/ThreadManager.cpp \
                        src/concurrency/TimerManager.cpp \
                        src/concurrency/Util.cpp \
@@ -86,7 +87,6 @@
                         src/concurrency/PosixThreadFactory.cpp
 endif
 
-
 libthriftnb_la_SOURCES = src/server/TNonblockingServer.cpp \
                          src/async/TAsyncProtocolProcessor.cpp \
                          src/async/TEvhttpServer.cpp \
@@ -94,7 +94,6 @@
 
 libthriftz_la_SOURCES = src/transport/TZlibTransport.cpp
 
-
 # Flags for the various libraries
 libthriftnb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
 libthriftz_la_CPPFLAGS  = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
@@ -114,9 +113,11 @@
 
 include_concurrencydir = $(include_thriftdir)/concurrency
 include_concurrency_HEADERS = \
+                         src/concurrency/BoostThreadFactory.h \
                          src/concurrency/Exception.h \
                          src/concurrency/Mutex.h \
                          src/concurrency/Monitor.h \
+                         src/concurrency/PlatformThreadFactory.h \
                          src/concurrency/PosixThreadFactory.h \
                          src/concurrency/Thread.h \
                          src/concurrency/ThreadManager.h \
@@ -186,15 +187,27 @@
 
 noinst_PROGRAMS = concurrency_test
 
-concurrency_test_SOURCES = src/concurrency/test/Tests.cpp \
+concurrency_test_SOURCES = \
+                           src/concurrency/test/Tests.cpp \
                            src/concurrency/test/ThreadFactoryTests.h \
                            src/concurrency/test/ThreadManagerTests.h \
                            src/concurrency/test/TimerManagerTests.h
 
 concurrency_test_LDADD = libthrift.la
 
+WINDOWS_DIST = \
+             README_WINDOWS \
+             src/windows \
+             thrift.sln \
+             libthrift.vcxproj \
+             libthrift.vcxproj.filters \
+             libthriftnb.vcxproj \
+             libthriftnb.vcxproj.filters
+
 EXTRA_DIST = \
              README \
+             README.SSL \
              thrift-nb.pc.in \
              thrift.pc.in \
-             thrift-z.pc.in
+             thrift-z.pc.in \
+             $(WINDOWS_DIST)
diff --git a/lib/csharp/Makefile.am b/lib/csharp/Makefile.am
index 8aa9a1f..10c148d 100644
--- a/lib/csharp/Makefile.am
+++ b/lib/csharp/Makefile.am
@@ -19,6 +19,7 @@
 
 THRIFTCODE= \
             src/Collections/THashSet.cs \
+            src/Properties/AssemblyInfo.cs \
             src/Protocol/TBase.cs \
             src/Protocol/TBase64Utils.cs \
             src/Protocol/TJSONProtocol.cs \
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index 5250cf6..4a1df57 100644
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -18,7 +18,7 @@
 #
 
 DESTDIR ?= /
-EXTRA_DIST = setup.py setup.cfg src
+EXTRA_DIST = setup.py setup.cfg src compat
 
 all-local:
 	$(PYTHON) setup.py build
diff --git a/test/Makefile.am b/test/Makefile.am
index 5ca20d0..9b30778 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,15 +38,16 @@
 
 EXTRA_DIST = \
 	cpp \
-	threads \
 	csharp \
+	erl \
+	hs \
+	ocaml \
+	perl \
+	php \
 	py \
 	py.twisted \
 	rb \
-	perl \
-	php \
-	hs \
-	ocaml \
+	threads \
 	AnnotationTest.thrift \
 	BrokenConstants.thrift \
 	ConstantsDemo.thrift \