diff --git a/Makefile.in b/Makefile.in
index b898af6d048e87..36d213a4ed5b57 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,13 +1,16 @@
 MAKE=		make
 
 SUBDIRS=	Parser Grammar Objects Python
+SUBDIRSTOO=	Include Extensions readline
+DISTFILES=	README Makefile configure configure.in
+DIST=		$(DISTFILES) $(SUBDIRS) $(SUBDIRSTOO)
 
 all:		config.status
 		for i in $(SUBDIRS); do (echo $$i; cd $$i; $(MAKE) all); done
 
 localclean:
 		-rm -f core *~ [@,#]* *.old *.orig *.rej
-		-(cd Py; rm -f core *~ [@,#]* *.old *.orig *.rej)
+		-(cd Include; rm -f core *~ [@,#]* *.old *.orig *.rej)
 
 clean:		localclean
 		-for i in $(SUBDIRS); do \
@@ -36,3 +39,7 @@ config.status:	configure
 configure:	configure.in
 		autoconf
  
+tar:		dist.tar.Z
+
+dist.tar.Z:	$(DIST)
+		tar cf - $(DIST) | compress >dist.tar.Z
diff --git a/README b/README
index df74e00c8d6c3e..e5ea8732ff4ac1 100644
--- a/README
+++ b/README
@@ -25,10 +25,12 @@ done so.)
 
 	make
 
-This will recursively run Make in each of the Parser, Objects and
-Python subdirectories.  In Parser it builds an executable "pgen" and a
-library libParser.a.  In Objects it builds a library libObjects.a.  In
-Python it builds a library libPython.a and an executable "python".
+This will recursively run Make in each of the Parser, Grammar, Objects
+and Python subdirectories.  In Parser it builds an executable "pgen"
+and a library libParser.a.  In Grammar it runs Parser/pgen to generate
+graminit.[ch] which are copied to Includes and Python, respectively.
+In Objects it builds a library libObjects.a.  In Python it builds a
+library libPython.a and an executable "python".
 
 (3) Test the resulting executable:
 
diff --git a/configure b/configure
index eb7fb97be45f53..43bc6865e91a5d 100755
--- a/configure
+++ b/configure
@@ -96,7 +96,7 @@ compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-unique_file=Py/object.h
+unique_file=Include/object.h
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
diff --git a/configure.in b/configure.in
index a01f12614d81e5..f70eb72ce480a2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(Py/object.h)
+AC_INIT(Include/object.h)
 
 # checks for alternative programs
 AC_PROG_CC