diff --git a/.cvsignore b/.cvsignore
index ea6546d..6d9a656 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,5 @@ netpbm-nojbig-10.25.tar.bz2
 netpbmdoc-nojbig-10.25.tar.bz2
 netpbm-nojbig-10.26.tar.bz2
 netpbmdoc-nojbig-10.26.tar.bz2
+netpbm-10.26.4.tar.bz2
+netpbmdoc-10.26.4.tar.bz2
diff --git a/netpbm.spec b/netpbm.spec
index 8bfb9d1..748b307 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,12 +1,12 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
-Version: 10.26
+Version: 10.26.4
 Release: 1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
-Source0: netpbm-nojbig-%{version}.tar.bz2
-Source1: netpbmdoc-nojbig-%{version}.tar.bz2
+Source0: netpbm-%{version}.tar.bz2
+Source1: netpbmdoc-%{version}.tar.bz2
 Patch1: netpbm-10.17-time.patch
 Patch2: netpbm-9.24-strip.patch
 Patch3: netpbm-10.18-manpath.patch
@@ -124,6 +124,12 @@ ln -sf libnetpbm.so.10 $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
 mkdir -p $RPM_BUILD_ROOT%{_mandir}
 tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
 
+# Don't ship man packages for non-existent binaries
+for i in hpcdtoppm.1 pcdovtoppm.1 pnmtojbig.1 \
+	 ppmsvgalib.1 vidtoppm.1 picttoppm.1; do
+	rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}
+done
+
 mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
 rm -rf $RPM_BUILD_ROOT/usr/README
 rm -rf $RPM_BUILD_ROOT/usr/VERSION
@@ -132,6 +138,8 @@ rm -rf $RPM_BUILD_ROOT/usr/misc
 rm -rf $RPM_BUILD_ROOT/usr/man
 rm -rf $RPM_BUILD_ROOT/usr/pkginfo
 
+
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -158,6 +166,11 @@ rm -rf $RPM_BUILD_ROOT/usr/pkginfo
 %{_mandir}/man5/*
 
 %changelog
+* Thu Mar 03 2005 Jindrich Novy <jnovy@redhat.com> 10.26.4-1
+- update to netpbm-10.26.4, remove jbig, hpcd
+- this version fixes #149924
+- regenerate man pages (don't include man pages without binaries - #146863)
+
 * Wed Jan 05 2005 Jindrich Novy <jnovy@redhat.com> 10.26-1
 - update to netpbm-10.26-1, remove jbig, hpcd
 - regenerate man pages, remove man pages for non existent binaries
diff --git a/sources b/sources
index 1d1a312..2bc0fa0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0a8c041f87bd7fa5234478ec8fb75a14  netpbm-nojbig-10.26.tar.bz2
-f7a048777a81cf2f9a6aaa4a1d476a2c  netpbmdoc-nojbig-10.26.tar.bz2
+2b77de25d0aceb7d39cfe95a826bb469  netpbm-10.26.4.tar.bz2
+cafe185e7e05f1c01611e78eaa0cdad3  netpbmdoc-10.26.4.tar.bz2