diff --git a/Makefile.in b/Makefile.in
index 5d0a59e9..9ffb4efb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,7 @@ manual:
 	cd doc; $(MAKE) $(MFLAGS) $@
 
 $(ZIPFILE):
-	zip -9y $(ZIPFILE) README HISTORY IMPLEMNT INSTALL *.spec *.mif \
+	zip -9y $(ZIPFILE) README HISTORY IMPLEMNT *.spec *.mif \
 	Makefile.in config.h.in configure configure.ac config.guess \
 	config.sub x11/xcurses-config.in install-sh aclocal.m4 curses.h \
 	curspriv.h panel.h term.h maintain.er pdcurses/README \
@@ -79,13 +79,13 @@ $(ZIPFILE):
 	os2/*.lrf os2/*.def sdl1/README sdl1/*.c sdl1/*.h sdl1/Make* \
 	win32/README win32/*.c win32/*.h win32/*.mak win32/*.def \
 	win32/*.ico win32/*.rc x11/README x11/*.c x11/*.h x11/Makefile.* \
-	x11/*.xbm doc/*.txt doc/manext.c doc/Makefile.in
+	x11/*.xbm doc/*.txt doc/manext.c doc/Makefile
 
 zip: $(ZIPFILE)
 
 ../$(TARBALL):
 	(cd ..; tar cvf - $(PDC_DIR)/README $(PDC_DIR)/HISTORY \
-	$(PDC_DIR)/IMPLEMNT $(PDC_DIR)/INSTALL $(PDC_DIR)/*.spec \
+	$(PDC_DIR)/IMPLEMNT $(PDC_DIR)/*.spec \
 	$(PDC_DIR)/*.mif $(PDC_DIR)/Makefile.in $(PDC_DIR)/aclocal.m4 \
 	$(PDC_DIR)/config.h.in $(PDC_DIR)/configure \
 	$(PDC_DIR)/config.guess $(PDC_DIR)/x11/xcurses-config.in \
@@ -104,7 +104,7 @@ zip: $(ZIPFILE)
 	$(PDC_DIR)/win32/*.ico $(PDC_DIR)/win32/*.rc $(PDC_DIR)/x11/README \
 	$(PDC_DIR)/x11/*.c $(PDC_DIR)/x11/*.xbm $(PDC_DIR)/x11/*.h \
 	$(PDC_DIR)/x11/Makefile.* $(PDC_DIR)/doc/manext.c \
-	$(PDC_DIR)/doc/Makefile.in | gzip -9 > $(TARBALL))
+	$(PDC_DIR)/doc/Makefile | gzip -9 > $(TARBALL))
 
 dist: ../$(TARBALL)
 
diff --git a/configure b/configure
index 5ec0252a..b8a5a10f 100755
--- a/configure
+++ b/configure
@@ -5486,7 +5486,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile x11/$mymakefile doc/Makefile x11/xcurses-config"
+ac_config_files="$ac_config_files Makefile x11/$mymakefile x11/xcurses-config"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6044,7 +6044,6 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "x11/$mymakefile") CONFIG_FILES="$CONFIG_FILES x11/$mymakefile" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "x11/xcurses-config") CONFIG_FILES="$CONFIG_FILES x11/xcurses-config" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.ac b/configure.ac
index c9123edc..a22b1d6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.33 2007/11/07 23:33:05 wmcbrine Exp $
+dnl $Id: configure.ac,v 1.34 2007/11/09 08:40:07 wmcbrine Exp $
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([PDCurses], [3.4], [wmcbrine@users.sf.net], [PDCurses])
@@ -200,7 +200,7 @@ dnl --------------- Check how to make shared libraries -------------------
 dnl Force the ability of shared library usage
 MH_SHARED_LIBRARY(XCurses)
 
-AC_CONFIG_FILES([Makefile x11/$mymakefile doc/Makefile x11/xcurses-config])
+AC_CONFIG_FILES([Makefile x11/$mymakefile x11/xcurses-config])
 AC_OUTPUT
 
 case "$target" in
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 00000000..8b5f3377
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,37 @@
+# Makefile for PDCurses manext program.
+
+all: manual
+
+manual: PDCurses.txt
+
+PDCurses.txt: manext
+	cat intro.txt > PDCurses.txt
+	echo PDCurses Definitions and Variables >> PDCurses.txt
+	echo ================================== >> PDCurses.txt
+	./manext ../curses.h >> PDCurses.txt
+	echo PDCurses Functions >> PDCurses.txt
+	echo ================== >> PDCurses.txt
+	./manext ../pdcurses/*.c >> PDCurses.txt
+	./manext ../x11/*.c >> PDCurses.txt
+	cat x11.txt >> PDCurses.txt
+	echo >> PDCurses.txt
+	echo >> PDCurses.txt
+	echo \
+-------------------------------------------------------------------------- \
+>> PDCurses.txt
+	echo >> PDCurses.txt
+	cat sdl.txt >> PDCurses.txt
+
+manext: manext.c
+
+install:
+	echo Does nothing at the moment
+
+clean:
+	-rm -rf *.o manext PDCurses.txt
+
+distclean: clean
+
+mostlyclean: clean
+
+realclean: distclean