diff --git a/.cvsignore b/.cvsignore
index e728704..4454664 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pinfo-0.6.8.tar.bz2
+pinfo-0.6.9.tar.bz2
diff --git a/pinfo.spec b/pinfo.spec
index c4dfa2e..b5fc43a 100644
--- a/pinfo.spec
+++ b/pinfo.spec
@@ -1,18 +1,13 @@
 Summary: An info file viewer.
 Name: pinfo
-Version: 0.6.8
-Release: 11.2.2
+Version: 0.6.9
+Release: 1%{?dist}
 Group: System Environment/Base
 License: GPL
-URL: http://dione.ids.pl/~pborys/software/pinfo
-# Actual source is .gz'd so I put the URL here, but convert to bz2
-#Source: http://dione.ids.pl/~pborys/software/pinfo/pinfo-%{version}.tar.gz
+URL: http://pinfo.alioth.debian.org
 Source: pinfo-%{version}.tar.bz2
-Patch0: pinfo-0.6.8-mkstemp.patch
 Patch1: pinfo-0.6.8-htmlview.patch
-Patch2: pinfo-0.6.8.memcorruption.patch
-Patch3: pinfo-0.6.8.memleak.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ncurses-devel
 Requires: htmlview
@@ -26,30 +21,27 @@ using regular expressions, and is based on the ncurses library.
 
 %prep
 %setup -q
-%patch0 -p0 -b .mkstemp
 %patch1 -p1 -b .links
-%patch2 -p1 -b .memcorruption
-%patch3 -p1 -b .memleak
 
 %build
-export CFLAGS="-ggdb $RPM_OPT_FLAGS"
-%configure --sysconfdir=/etc --disable-nls
+%configure
 make
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}
-%{makeinstall}
+make DESTDIR=$RPM_BUILD_ROOT install
 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
+%find_lang %{name}
+
+%files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TECHSTUFF TODO
+%doc AUTHORS COPYING ChangeLog* NEWS README TECHSTUFF
 # Purposefully not flagged noreplace to ensure new versions have working config
 %config %{_sysconfdir}/pinforc
 %{_bindir}/pinfo
@@ -70,6 +62,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 12 2006 Miroslav Lichvar <mlichvar@redhat.com> 0.6.9-1.fc6
+- update to 0.6.9
+- package locale files
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.6.8-11.2.2
 - rebuild
 
diff --git a/sources b/sources
index d2e9c00..2fec5ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e89261b3acfd10ec736e8d431c39bf7  pinfo-0.6.8.tar.bz2
+e0c788467945f5f97fbacad55863e5b8  pinfo-0.6.9.tar.bz2