diff --git a/.cvsignore b/.cvsignore
index a7afce8..b297b22 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-apcupsd-3.14.1.tar.gz
+apcupsd-3.14.2.tar.gz
diff --git a/apcupsd-3.14.1-linux-usb.patch b/apcupsd-3.14.1-linux-usb.patch
deleted file mode 100644
index 8ad7652..0000000
--- a/apcupsd-3.14.1-linux-usb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c.linux-usb	2007/05/02 00:26:52	1.26.6.1
-+++ apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c	2007/06/29 22:18:41	1.26.6.2
-@@ -114,20 +114,17 @@
-    if (fd >= 0) {
-       /* Check for the UPS application HID usage */
-       for (i = 0; (ret = ioctl(fd, HIDIOCAPPLICATION, i)) > 0; i++) {
--         if ((ret & 0xffff000) == (UPS_USAGE & 0xffff0000))
--            break;
--      }
--      /* If we found the UPS application usage, we're good to go */     
--      if (ret) {
--         /* Request full uref reporting from read() */
--         if (FORCE_COMPAT24 || ioctl(fd, HIDIOCSFLAG, &flaguref)) {
--            Dmsg0(100, "HIDIOCSFLAG failed; enabling linux-2.4 "
--                   "compatibility mode\n");
--            my_data->compat24 = true;
-+         if ((ret & 0xffff000) == (UPS_USAGE & 0xffff0000)) {
-+            /* Request full uref reporting from read() */
-+            if (FORCE_COMPAT24 || ioctl(fd, HIDIOCSFLAG, &flaguref)) {
-+               Dmsg0(100, "HIDIOCSFLAG failed; enabling linux-2.4 "
-+                      "compatibility mode\n");
-+               my_data->compat24 = true;
-+            }
-+            /* Successfully opened the device */
-+            Dmsg1(200, "Successfully opened \"%s\"\n", dev);
-+            return fd;
-          }
--         /* Successfully opened the device */
--         Dmsg1(200, "Successfully opened \"%s\"\n", dev);
--         return fd;
-       }
-       close(fd);
-    }
diff --git a/apcupsd.spec b/apcupsd.spec
index 5d238aa..f2fce38 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.14.1
-Release:      3%{?dist}
+Version:      3.14.2
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -10,8 +10,6 @@ Source0:      http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
 Source1:      apcupsd.logrotate
 Source2:      apcupsd-httpd.conf
 Patch0:       apcupsd-3.14.1-init.patch
-Patch1:       apcupsd-3.14.1-linux-usb.patch
-Patch2:       apcupsd-3.14.1-cloexec.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
@@ -57,8 +55,6 @@ A GUI interface to the APC UPS monitoring daemon.
 %prep
 %setup -q
 %patch -p1 -b .init
-%patch1 -p1 -b .linux-usb
-%patch2 -p1 -b .cloexec
 # Don't strip binaries
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
 
@@ -174,6 +170,9 @@ fi
 
 
 %changelog
+* Wed Oct 10 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.14.2-1
+- Update to 3.14.2, remove upstreamed patches
+
 * Wed Aug  1 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.14.1-3
 - Add patch to close open file descriptors (bug #247162)
 - Stop/restart service as needed on removal/upgrade
diff --git a/sources b/sources
index a0bcb26..fb67d8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-258eb7515a12de493bb8952bc6d2f4e1  apcupsd-3.14.1.tar.gz
+fd8785e7607d20cefa68dc20e44eebc4  apcupsd-3.14.2.tar.gz