diff --git a/hplip-faxing-with-low-supplies.patch b/hplip-faxing-with-low-supplies.patch
deleted file mode 100644
index 3bbd055..0000000
--- a/hplip-faxing-with-low-supplies.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- hplip-1.7.2/sendfax.py.faxing-with-low-supplies	2007-02-27 22:30:34.000000000 +0000
-+++ hplip-1.7.2/sendfax.py	2007-05-04 17:38:44.000000000 +0100
-@@ -654,7 +654,7 @@
-             log.error("Query device error (%s)." % e.msg)
-             dev.error_state = ERROR_STATE_ERROR
- 
--        if dev.error_state > ERROR_STATE_MAX_OK:
-+        if dev.error_state > ERROR_STATE_MAX_OK and dev.error_state != ERROR_STATE_LOW_SUPPLIES and dev.error_state != ERROR_STATE_LOW_PAPER:
-             log.error("Device is busy or in an error state (code=%d). Please wait for the device to become idle or clear the error and try again." % dev.error_state)
-             sys.exit(1)
-             
---- hplip-1.7.2/ui/faxsendjobform.py.faxing-with-low-supplies	2007-02-28 22:35:18.000000000 +0000
-+++ hplip-1.7.2/ui/faxsendjobform.py	2007-05-04 17:38:51.000000000 +0100
-@@ -544,7 +544,7 @@
-             QApplication.restoreOverrideCursor()
- 
- 
--        if self.dev.error_state > ERROR_STATE_MAX_OK:
-+        if self.dev.error_state > ERROR_STATE_MAX_OK and self.dev.error_state != ERROR_STATE_LOW_SUPPLIES and self.dev.error_state != ERROR_STATE_LOW_PAPER:
-             self.FailureUI(self.__tr("<b>Device is busy or in an error state (code=%1)</b><p>Please wait for the device to become idle or clear the error and try again.").arg(self.dev.status_code))
-             return
- 
diff --git a/hplip-marker-supply.patch b/hplip-marker-supply.patch
deleted file mode 100644
index a6d8048..0000000
--- a/hplip-marker-supply.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- hplip-1.7.2/prnt/hpijs/hpijs.cpp.marker-supply	2007-03-30 17:44:32.000000000 +0100
-+++ hplip-1.7.2/prnt/hpijs/hpijs.cpp	2007-03-30 17:53:23.000000000 +0100
-@@ -516,7 +516,31 @@
-       goto BUGOUT;
-    }
-    if (pSS->pPC->constructor_error < 0)
-+   {
-       bug("WARNING: %s\n", pSS->GetDriverMessage(pSS->pPC->constructor_error));
-+      switch (pSS->pPC->constructor_error)
-+      {
-+      case WARN_LOW_INK_BOTH_PENS:
-+      case WARN_LOW_INK_BLACK:
-+      case WARN_LOW_INK_COLOR:
-+      case WARN_LOW_INK_PHOTO:
-+      case WARN_LOW_INK_GREY:
-+      case WARN_LOW_INK_BLACK_PHOTO:
-+      case WARN_LOW_INK_COLOR_PHOTO:
-+      case WARN_LOW_INK_GREY_PHOTO:
-+      case WARN_LOW_INK_COLOR_GREY:
-+      case WARN_LOW_INK_COLOR_GREY_PHOTO:
-+      case WARN_LOW_INK_COLOR_BLACK_PHOTO:
-+      case WARN_LOW_INK_CYAN:
-+      case WARN_LOW_INK_MAGENTA:
-+      case WARN_LOW_INK_YELLOW:
-+      case WARN_LOW_INK_MULTIPLE_PENS:
-+	 bug("STATE: +marker-supply-low-warning\n");
-+	 break;
-+      default:
-+	 bug("STATE: -marker-supply-low-warning\n");
-+      }
-+   }
- 
- #if 0
-    bug("device model=%s\n", pSS->pPC->PrinterModel());
diff --git a/hplip.spec b/hplip.spec
index 3bd8aab..8bdf5e8 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 1.7.2
-Release: 11%{?dist}
+Version: 1.7.4a
+Release: 1%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,10 +19,8 @@ Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-libm.patch
 Patch6: hplip-ipv6.patch
-Patch7: hplip-marker-supply.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
-Patch10: hplip-faxing-with-low-supplies.patch
 Patch11: hplip-unload-traceback.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
@@ -103,18 +101,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # IPv6 support (bug #198377).
 %patch6 -p1 -b .ipv6
 
-# Use marker-supply-low IPP message.
-%patch7 -p1 -b .marker-supply
-
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
 # Clear the media-empty-error printer state.
 %patch9 -p1 -b .media-empty
 
-# When faxing, low ink/paper is not a problem (bug #238664).
-%patch10 -p1 -b .faxing-with-low-supplies
-
 # Prevent a traceback when unloading a photo card (bug #238617).
 %patch11 -p1 -b .unload-traceback
 
@@ -233,8 +225,6 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/unload
 # Directories
 %{_datadir}/hplip/base
-%{_datadir}/hplip/Cheetah
-%{_datadir}/hplip/cherrypy
 %{_datadir}/hplip/copier
 %dir %{_datadir}/hplip/data
 %{_datadir}/hplip/data/firmware
@@ -299,6 +289,11 @@ fi
 exit 0
 
 %changelog
+* Wed Jun 13 2007 Tim Waugh <twaugh@redhat.com> 1.7.4a-1
+- 1.7.4a.  No longer need marker-supply or faxing-with-low-supplies
+  patches.  Cheetah and cherrypy directories no longer shipped in source
+  tarball.
+
 * Mon Jun 11 2007 Tim Waugh <twaugh@redhat.com>
 - Don't ship hp-check (bug #243273).
 - Moved hp-setup back to the base package, and put code in