diff --git a/.cvsignore b/.cvsignore
index 1e8ca49..7e3d07c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pinfo-0.6.4.tar.bz2
+pinfo-0.6.6.tar.bz2
diff --git a/pinfo.spec b/pinfo.spec
index 8f49438..a6299e1 100644
--- a/pinfo.spec
+++ b/pinfo.spec
@@ -1,53 +1,94 @@
 Summary: An info file viewer.
 Name: pinfo
-Version: 0.6.4
-Release: 7
+Version: 0.6.6
+Release: 4
 Group: System Environment/Base
 License: GPL
-URL: http://zeus.polsl.gliwice.pl/~pborys/
+URL: http://zeus.polsl.gliwice.pl/~pborys
+# Actual source is .gz'd so I put the URL here, but convert to bz2
+#Source: http://zeus.polsl.gliwice.pl/~pborys/stable-version/pinfo-%{version}.tar.gz
 Source: pinfo-%{version}.tar.bz2
 Patch0: pinfo-0.6.0-mkstemp.patch
-BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: ncurses-devel
+Patch1: pinfo-0.6.6-0.6.6p1.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: ncurses-devel
+Prereq: /sbin/install-info
 
 %description
 Pinfo is an info file (or man page) viewer with a user interface
-similar to the Lynx Web browser's interface.  Pinfo support regexp
-searching and is based on the ncurses library.
+similar to the Lynx Web browser's interface.  Pinfo supports searching
+using regular expressions, and is based on the ncurses library.
 
 %prep
 %setup -q
 %patch -p1 -b .mkstemp
+%patch1 -p1 -b .patch0.6.6-0.6.6p1
 
 %build
-CFLAGS=-ggdb; export CFLAGS
+export CFLAGS=-ggdb
 %configure --sysconfdir=/etc --disable-nls
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}
 %{makeinstall}
 ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman
 ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1
 
+# This file should not be packaged
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TECHSTUFF TODO
-%config /etc/pinforc
+# Purposefully not flagged noreplace to ensure new versions have working config
+%config %{_sysconfdir}/pinforc
 %{_bindir}/pinfo
 %{_bindir}/pman
+%{_infodir}/pinfo.info*
 %{_mandir}/man1/pinfo.1*
 %{_mandir}/man1/pman.1*
 
+%post
+/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir
+ 
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+* Wed Jan 22 2003 Mike A. Harris <mharris@redhat.com> 0.6.6-4
+- Added pinfo-0.6.6-0.6.6p1.patch to fix bug (#78504)
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Wed Dec 11 2002 Karsten Hopp <karsten@redhat.de> 0.6.6-2
+- add missing Prereq
+
+* Tue Nov 12 2002 Mike A. Harris <mharris@redhat.com> 0.6.6-1
+- Updated to 0.6.6
+- Corrected typos in description field
+
+* Tue Nov 12 2002 Mike A. Harris <mharris@redhat.com> 0.6.4-9
+- Now how ironic is *this* one?...  The info documentation on pinfo has been
+  missing from our packages.  Mass rebuild tests caught this.  Fixed now.
+- Added post/preun scripts for updating info dir db with install-info
+
+* Sat Oct  5 2002 Mike A. Harris <mharris@redhat.com> 0.6.4-8
+- All-arch rebuild
+- Added _sysconfdir where appropriate
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.6.4-7
 - automated rebuild
 
-* Sun May 26 2002 Tim Powers <timp@redhat.com>
+* Sun May 26 2002 Tim Powers <timp@redhat.com> 0.6.4-6
 - automated rebuild
 
 * Wed May 22 2002 Mike A. Harris <mharris@redhat.com> 0.6.4-5
diff --git a/sources b/sources
index 3ac15e6..8f25edc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7254c8a756bda4ece82bfbed4463d9e2  pinfo-0.6.4.tar.bz2
+03fdfc44135b441e7fb49bacd42b20fb  pinfo-0.6.6.tar.bz2