diff --git a/enscript-1.6.1-config.patch b/enscript-1.6.1-config.patch
index c15372e..5823a9d 100644
--- a/enscript-1.6.1-config.patch
+++ b/enscript-1.6.1-config.patch
@@ -1,6 +1,45 @@
---- enscript-1.6.1/lib/Makefile.in.config	Mon Nov  9 15:37:40 1998
-+++ enscript-1.6.1/lib/Makefile.in	Mon Nov  9 15:39:04 1998
-@@ -240,15 +240,16 @@
+--- enscript-1.6.4/afm/Makefile.am.config	2003-03-05 07:26:16.000000000 +0000
++++ enscript-1.6.4/afm/Makefile.am	2005-12-23 09:56:52.000000000 +0000
+@@ -36,11 +36,11 @@
+ EXTRA_DIST = font.map $(default_afm) $(public_fonts)
+ 
+ install-data-local:
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
+ 	for f in $(EXTRA_DIST); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \
+ 	done
+ 
+ uninstall-local:
+-	rm -rf $(datadir)/enscript/afm
++	rm -rf $(DESTDIR)/$(datadir)/enscript/afm
+--- enscript-1.6.4/afm/Makefile.in.config	2003-03-05 07:40:06.000000000 +0000
++++ enscript-1.6.4/afm/Makefile.in	2005-12-23 09:56:52.000000000 +0000
+@@ -319,14 +319,14 @@
+ 
+ 
+ install-data-local:
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
+ 	for f in $(EXTRA_DIST); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \
+ 	done
+ 
+ uninstall-local:
+-	rm -rf $(datadir)/enscript/afm
++	rm -rf $(DESTDIR)/$(datadir)/enscript/afm
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- enscript-1.6.4/lib/Makefile.in.config	2003-03-05 07:40:07.000000000 +0000
++++ enscript-1.6.4/lib/Makefile.in	2005-12-23 09:56:52.000000000 +0000
+@@ -345,15 +345,16 @@
  all-local: enscript.cfg
  
  install-data-local: enscript.cfg
@@ -22,55 +61,35 @@
  
  enscript.cfg: $(srcdir)/enscript.cfg.in Makefile
  	sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \
---- enscript-1.6.1/po/Makefile.in.in.config	Mon Nov  9 15:43:34 1998
-+++ enscript-1.6.1/po/Makefile.in.in	Mon Nov  9 15:45:17 1998
-@@ -137,27 +137,27 @@
- 	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r $(MKINSTALLDIRS); then \
--	    $(MKINSTALLDIRS) $$dir; \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
- 	  else \
- 	    $(top_srcdir)/mkinstalldirs $$dir; \
- 	  fi; \
- 	  if test -r $$cat; then \
--	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
--	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  else \
--	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
- 	    echo "installing $(srcdir)/$$cat as" \
--		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+		 "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  fi; \
- 	  if test -r $$cat.m; then \
--	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
--	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+	    $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+	    echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	  else \
- 	    if test -r $(srcdir)/$$cat.m ; then \
- 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
--		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+		$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- 	      echo "installing $(srcdir)/$$cat as" \
--		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+		   "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	    else \
- 	      true; \
- 	    fi; \
---- enscript-1.6.1/states/Makefile.in.config	Mon Nov  9 15:46:55 1998
-+++ enscript-1.6.1/states/Makefile.in	Mon Nov  9 15:47:17 1998
-@@ -493,8 +493,8 @@
- 	$(srcdir)/over.in > over
+--- enscript-1.6.4/states/hl/Makefile.am.config	2005-12-23 09:59:55.000000000 +0000
++++ enscript-1.6.4/states/hl/Makefile.am	2005-12-23 10:00:09.000000000 +0000
+@@ -45,10 +45,10 @@
+ EXTRA_DIST = $(states)
+ 
+ install-data-local:
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl
+ 	for f in $(states); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \
+ 	done
+ 
+ uninstall-local:
+--- enscript-1.6.4/states/hl/Makefile.in.config	2005-12-23 10:00:13.000000000 +0000
++++ enscript-1.6.4/states/hl/Makefile.in	2005-12-23 10:00:34.000000000 +0000
+@@ -330,10 +330,10 @@
+ 
  
- install-data-local: enscript.st
+ install-data-local:
 -	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
--	$(INSTALL_DATA) $(srcdir)/enscript.st $(datadir)/enscript/enscript.st
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
-+	$(INSTALL_DATA) $(srcdir)/enscript.st $(DESTDIR)$(datadir)/enscript/enscript.st
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl
+ 	for f in $(states); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \
+ 	done
  
  uninstall-local:
- 	rm -f $(datadir)/enscript/enscript.st
diff --git a/enscript.spec b/enscript.spec
index 23737be..b46b68d 100644
--- a/enscript.spec
+++ b/enscript.spec
@@ -1,18 +1,15 @@
 Summary: A plain ASCII to PostScript converter.
 Name: enscript
-Version: 1.6.1
-Release: 31.1
+Version: 1.6.4
+Release: 1
 License: GPL
 Group: Applications/Publishing
-Source0: ftp://ftp.gnu.org/pub/gnu/enscript/enscript-%{version}.tar.gz
+Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
 Patch0: enscript-1.6.1-config.patch
-Patch2: enscript-1.6.1-tmp.patch
 Patch3: enscript-1.6.1-locale.patch
 Patch4: enscript-doublefree.patch
-Patch5: enscript-1.6.1-CAN-2004-1184.patch
 Patch6: enscript-1.6.1-CAN-2004-1185.patch
 Patch7: enscript-1.6.1-CAN-2004-1186.patch
-Patch8: enscript-demunge.patch
 URL: http://people.ssh.fi/mtr/genscript/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: nenscript
@@ -27,13 +24,10 @@ includes many options for customizing printouts.
 %prep
 %setup -q
 %patch0 -p1 -b .config
-%patch2 -p1 -b .tmp
 %patch3 -p1 -b .locale
 %patch4 -p1 -b .doublefree
-%patch5 -p1 -b .CAN-2004-1184
 %patch6 -p1 -b .CAN-2004-1185
 %patch7 -p1 -b .CAN-2004-1186
-%patch8 -p1 -b .demunge
 
 %build
 %configure --with-media=Letter
@@ -48,8 +42,10 @@ make DESTDIR=%{buildroot} install
 %find_lang %name
 
 # XXX note doubled %% in sed script below.
-(cd %{buildroot};find .%{_datadir}/enscript/*) | \
+(cd %{buildroot};find .%{_datadir}/enscript/* \! -type d) | \
 	sed -e 's,^\.,,' | sed -e 's,*font.map,%%config &,' > share.list
+(cd %{buildroot};find .%{_datadir}/enscript/* -type d) | \
+	sed -e 's,^\.,,' | sed -e 's,^,%dir ,' >> share.list
 
 ( cd %{buildroot}
   ln .%{_prefix}/bin/enscript .%{_prefix}/bin/nenscript
@@ -60,16 +56,31 @@ cat %{name}.lang >> share.list
 %clean
 rm -rf %{buildroot}
 
+%preun
+if [ $1 = 0 ]; then
+    [ -f %{_infodir}/%{name}.info.gz ] && \
+      /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
+	%{_infodir}/dir || :
+fi
+
+%post
+[ -f %{_infodir}/%{name}.info.gz ] && \
+  /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
+
 %files -f share.list
+%doc AUTHORS ChangeLog docs/FAQ.html NEWS README README.ESCAPES THANKS TODO 
 %defattr(-,root,root)
 %{_bindir}/*
 %{_mandir}/man1/*
 %dir %{_datadir}/enscript
+%{_infodir}/%{name}*
 %config(noreplace) %{_sysconfdir}/enscript.cfg
 
-%doc AUTHORS ChangeLog FAQ.html NEWS README README.ESCAPES THANKS TODO 
 
 %changelog
+* Fri Dec 23 2005 Tim Waugh <twaugh@redhat.com> 1.6.4-1
+- 1.6.4.  No longer need tmp, CAN-2004-1184, demunge patches.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt