diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..a71974d
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = compiler/cpp lib/cpp lib/py if
+## 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 \
+						 thrift.el thrift.vim thrift.bnf CONTRIBUTORS LICENSE \
+             lib/cocoa lib/erl lib/hs lib/java lib/ocaml lib/perl lib/php lib/rb
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..eb15fd1
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,50 @@
+Release Notes for Thrift 20070917
+
+TBinaryProtocol now includes a protocol version number in messaged.
+This is a non-backwards-compatible change.  Please see the
+TBinaryProtocol constructor for strictRead_ and strictWrite_.
+
+Add binary type to support non-text "strings" in Java.
+
+TSocketPool for C++ (developed by jsobel).
+
+Syntax highlighting for vim and emacs (developed by hzhao and martin).
+
+Perl support (contributed by Jake Luciani).
+
+Erlang support (developed by cpiro).
+
+Ruby API overhaul (contributed by Kevin Clark of Powerset).
+
+IPv6 support in C++ and Python (contributed by Paul Saab of Powerset).
+
+Read/Write locks (developed by boz).
+
+OCaml support (developed by iproctor).
+
+Human-readable strings from Thrift structures in C++ (developed by dreiss).
+
+Haskell support (developed by iproctor).
+
+Support for optional fields in C++ (contributed by Andy Lutomirsky).
+
+Support for operator== for Thrift structures (contributed by Andy Lutomirsky).
+
+Python/C module for fast (de)serialization (contributed by Ben Maurer).
+
+Limited reflection for C++ services (developed by dreiss).
+
+Python library installation defaults to /usr, override with PY_PREFIX.
+
+Support for Javabean-style Java classes (contributed by Dave Engberg).
+
+TDenseProtocol for C++ (experimental way to shrink structures)
+(developed by dreiss).
+
+Cocoa/Objective C support (contributed by Andrew McGeachie).
+
+Thrift now builds without libevent.
+
+TZlibTransport for C++ (compress serialized structures) (developed by dreiss).
+
+Tons of small improvements and bug fixes.
diff --git a/README b/README
index 5dc232e..7206259 100644
--- a/README
+++ b/README
@@ -63,6 +63,9 @@
 Some portions of Thrift also depend upon libevent, see:
 http://monkey.org/~provos/libevent/
 
+Some portions of Thrift also depend upon zlib, see:
+http://www.zlib.net/
+
 These libraries are open source and may be freely obtained, but they are not
 provided as a part of this distribution.
 
@@ -82,7 +85,8 @@
 ============
 
 If you are building from the first time out of the source repository, you will
-need to generate the configure scripts.  From the top directory, do:
+need to generate the configure scripts.  (This is not necessary if you
+downloaded a tarball.)  From the top directory, do:
 
 	./bootstrap.sh
 
diff --git a/bootstrap.sh b/bootstrap.sh
index d2e240a..c73e709 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,7 +3,6 @@
 subdirs="compiler/cpp lib/cpp lib/py if"
 
 ./cleanup.sh
-echo "SUBDIRS = ${subdirs}" > Makefile.am
 
 aclocal
 touch NEWS README AUTHORS ChangeLog
diff --git a/cleanup.sh b/cleanup.sh
index c7f5054..0ffe31c 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -6,11 +6,9 @@
 AUTHORS \
 ChangeLog \
 INSTALL \
-Makefile.am \
 Makefile \
 Makefile.in \
 Makefile.orig \
-NEWS \
 aclocal.m4 \
 autom4te.cache \
 autoscan.log \
@@ -29,6 +27,7 @@
 libtool \
 ltmain.sh \
 missing \
+ylwrap \
 if/gen-*
 
 for subdir in ${subdirs}; do 
diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index ae69de9..b65dbb1 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -19,12 +19,48 @@
                  src/generate/t_ocaml_generator.cc \
                  src/generate/t_erl_generator.cc \
                  src/generate/t_hs_generator.cc \
-                 src/generate/t_cocoa_generator.cc 
+                 src/generate/t_cocoa_generator.cc \
+								 src/globals.h \
+								 src/main.h \
+								 src/md5.h \
+								 src/parse/t_doc.h \
+								 src/parse/t_type.h \
+								 src/parse/t_base_type.h \
+								 src/parse/t_enum.h \
+								 src/parse/t_enum_value.h \
+								 src/parse/t_typedef.h \
+								 src/parse/t_container.h \
+								 src/parse/t_list.h \
+								 src/parse/t_set.h \
+								 src/parse/t_map.h \
+								 src/parse/t_struct.h \
+								 src/parse/t_field.h \
+								 src/parse/t_service.h \
+								 src/parse/t_function.h \
+								 src/parse/t_program.h \
+								 src/parse/t_scope.h \
+								 src/parse/t_const.h \
+								 src/parse/t_const_value.h \
+								 src/generate/t_generator.h \
+								 src/generate/t_oop_generator.h \
+								 src/generate/t_cpp_generator.h \
+								 src/generate/t_java_generator.h \
+								 src/generate/t_php_generator.h \
+								 src/generate/t_py_generator.h \
+								 src/generate/t_rb_generator.h \
+								 src/generate/t_xsd_generator.h \
+								 src/generate/t_perl_generator.h \
+								 src/generate/t_ocaml_generator.h \
+								 src/generate/t_erl_generator.h \
+								 src/generate/t_hs_generator.h \
+								 src/generate/t_cocoa_generator.h
 
 thrift_CXXFLAGS = -Wall -Isrc $(BOOST_CPPFLAGS)
 thrift_LDFLAGS = -Wall $(BOOST_LDFLAGS)
 
 thrift_LDADD = @LEXLIB@
 
+EXTRA_DIST = bootstrap.sh cleanup.sh LICENSE
+
 clean-local:
 	rm -rf thriftl.cc thrifty.cc thrifty.h
diff --git a/configure.ac b/configure.ac
index 2605478..8591d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([thrift], [1.0])
+AC_INIT([thrift], [20070917])
 
 AC_CONFIG_AUX_DIR([.])
 
diff --git a/if/Makefile.am b/if/Makefile.am
index 2f269f1..94b8929 100644
--- a/if/Makefile.am
+++ b/if/Makefile.am
@@ -1,3 +1,4 @@
 thrift_ifdir = $(datadir)/thrift/if
 dist_thrift_if_DATA = \
                       reflection_limited.thrift
+EXTRA_DIST = bootstrap.sh cleanup.sh regen.sh
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 7b1f1b0..6df9ab4 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I ./aclocal
+
 lib_LTLIBRARIES = libthrift.la
 ## We only build the extra libraries if we have the dependencies,
 ## but we install all of the headers unconditionally.
@@ -55,6 +57,7 @@
 include_thrift_HEADERS = \
                          config.h \
                          src/Thrift.h \
+												 src/TReflectionLocal.h \
                          src/reflection_limited_types.h \
                          src/TProcessor.h \
                          src/TLogging.h
@@ -73,7 +76,7 @@
 include_protocoldir = $(include_thriftdir)/protocol
 include_protocol_HEADERS = \
                          src/protocol/TBinaryProtocol.h \
-                         src/protocol/TDenseProtocol.cpp \
+                         src/protocol/TDenseProtocol.h \
                          src/protocol/TDebugProtocol.h \
                          src/protocol/TOneWayProtocol.h \
                          src/protocol/TProtocolException.h \
@@ -105,7 +108,7 @@
                          src/processor/PeekProcessor.h \
                          src/processor/StatsProcessor.h
 
-bin_PROGRAMS = concurrency_test
+noinst_PROGRAMS = concurrency_test
 
 concurrency_test_SOURCES = src/concurrency/test/Tests.cpp \
                            src/concurrency/test/ThreadFactoryTests.h \
@@ -116,3 +119,5 @@
 
 concurrency_test_CXXFLAGS =  $(common_cxxflags)
 concurrency_test_LDFLAGS =  $(common_ldflags)
+
+EXTRA_DIST = bootstrap.sh cleanup.sh LICENSE
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index 7db5c3b..7d47430 100644
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -6,3 +6,5 @@
 #$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
 install-exec-hook:
 	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
+
+EXTRA_DIST = bootstrap.sh cleanup.sh setup.py LICENSE src