diff --git a/hplip.spec b/hplip.spec
index a90b827..0e75e9f 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -166,7 +166,17 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip
-%{_bindir}/hp-*
+%{_bindir}/hp-align
+%{_bindir}/hp-check
+%{_bindir}/hp-clean
+%{_bindir}/hp-colorcal
+%{_bindir}/hp-firmware
+%{_bindir}/hp-info
+%{_bindir}/hp-levels
+%{_bindir}/hp-makeuri
+%{_bindir}/hp-probe
+%{_bindir}/hp-testpage
+%{_bindir}/hp-unload
 %{_sbindir}/hpiod
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
@@ -174,6 +184,7 @@ rm -rf %{buildroot}
 %dir %{_datadir}/hplip
 # Files
 %{_datadir}/hplip/align
+%{_datadir}/hplip/check
 %{_datadir}/hplip/clean
 %{_datadir}/hplip/colorcal
 %{_datadir}/hplip/firmware
@@ -185,6 +196,7 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/probe
 %{_datadir}/hplip/testpage
 %{_datadir}/hplip/timedate
+%{_datadir}/hplip/unload
 # Directories
 %{_datadir}/hplip/base
 %{_datadir}/hplip/Cheetah
@@ -201,8 +213,14 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/scan
 
 %files gui
+%{_bindir}/hp-fab
+%{_bindir}/hp-makecopies
+%{_bindir}/hp-print
+%{_bindir}/hp-sendfax
+%{_bindir}/hp-setup
+%{_bindir}/hp-timedate
+%{_bindir}/hp-toolbox
 # Files
-%{_datadir}/hplip/check
 %{_datadir}/hplip/data/images
 %{_datadir}/hplip/fab
 %{_datadir}/hplip/fax
@@ -211,7 +229,6 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/sendfax
 %{_datadir}/hplip/setup
 %{_datadir}/hplip/toolbox
-%{_datadir}/hplip/unload
 # Directories
 %{_datadir}/hplip/ui
 %{_datadir}/hplip/plugins
@@ -256,6 +273,8 @@ exit 0
 
 %changelog
 * Fri Apr 13 2007 Tim Waugh <twaugh@redhat.com>
+- Fixed dangling symlinks (bug #236156).
+- Move all fax bits to the gui package (bug #236161).
 - Don't ship fax PPD and backend twice (bug #236092).
 - Run update-desktop-database in the gui package's %%post scriptlet
   (bug #236163).