diff --git a/.cvsignore b/.cvsignore
index 820966b..e137cf5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -155,3 +155,5 @@ NetworkManager-0.7.1.git20090414.tar.bz2
 network-manager-applet-0.7.1.tar.bz2
 NetworkManager-0.7.1.git20090617.tar.bz2
 network-manager-applet-0.7.1.git20090617.tar.bz2
+NetworkManager-0.7.1.git20090708.tar.bz2
+network-manager-applet-0.7.1.git20090708.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 088f450..8fbc9c8 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090617
-%define applet_snapshot .git20090617
+%define snapshot .git20090708
+%define applet_snapshot .git20090708
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.1
-Release: 6%{snapshot}%{?dist}
+Release: 7%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,7 +26,6 @@ Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2
 Source2: nm-system-settings.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
-Patch3: nm-serial-port-settings-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -147,7 +146,6 @@ tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
-%patch3 -p1 -b .serial
 
 %build
 
@@ -281,7 +279,7 @@ fi
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 %{_datadir}/PolicyKit/policy/*.policy
 %{udev_scriptdir}/nm-modem-probe
-%{udev_scriptdir}/rules.d/77-nm-probe-modem-capabilities.rules
+%{udev_scriptdir}/rules.d/*.rules
 
 %files devel
 %defattr(-,root,root,0755)
@@ -328,6 +326,12 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Jul  8 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-7.git20090708
+- nm: fixes for ZTE/Onda modem detection
+- nm: prevent re-opening serial port when the SIM has a PIN
+- applet: updated translations
+- editor: show list column headers
+
 * Thu Jun 25 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-6.git20090617
 - nm: fix serial port settings
 
diff --git a/nm-serial-port-settings-fix.patch b/nm-serial-port-settings-fix.patch
deleted file mode 100644
index 593128e..0000000
--- a/nm-serial-port-settings-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 793cc30b5d20d728719c568f5bfac98f3bca3dca
-Author: Robert Piasek <robert@piasek.co.uk>
-Date:   Mon Jun 22 11:57:28 2009 -0400
-
-    serial: fix serial port settings bug caused by 31a34fa7ffbceb79d5e6c16158e5dcce285dcff1
-
-diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c
-index 54dd176..ad481d3 100644
---- a/src/nm-serial-device.c
-+++ b/src/nm-serial-device.c
-@@ -368,7 +368,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting)
- 	stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB);
- 	stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits);
- 
--	if (tcgetattr (priv->fd, &stbuf) < 0) {
-+	if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) {
- 		nm_warning ("(%s) cannot control device (errno %d)",
- 		            nm_device_get_iface (NM_DEVICE (device)), errno);
- 		return FALSE;
diff --git a/sources b/sources
index 15e5eab..9060a54 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ff7ce2a726e0db4c230d27da7e4c5845  NetworkManager-0.7.1.git20090617.tar.bz2
-6467f0318e8b647b7591a1f18e73b319  network-manager-applet-0.7.1.git20090617.tar.bz2
+f361c757fda787a2a90719b9ae668702  NetworkManager-0.7.1.git20090708.tar.bz2
+801d31708a175d2133edc66007667d71  network-manager-applet-0.7.1.git20090708.tar.bz2