diff --git a/.cvsignore b/.cvsignore
index d39229d..9f3c392 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 gnome-applets-2.20.0.tar.bz2
+gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 6ca5078..7e34518 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,17 +34,20 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 Source: 	http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
 Source1:        copy.xsl
+Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.17.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
@@ -65,6 +68,8 @@ Patch35:	gnome-applets-2.20.0-mixer-out-of-sync.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=479172
 Patch36:	gweather-pc.patch
 
+Patch34:        ppp-includes.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -154,6 +159,7 @@ libraries contained in the gnome-applets package.
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
@@ -168,6 +174,14 @@ popd
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
+# We don't ship gnome-system-tools
+rm -rf modemlights
+tar xjf %{SOURCE2}
+
+%patch3 -p1 -b .ppp-command
+
+%patch34 -p1 -b .ppp-includes
+
 intltoolize --force
 autoconf
 
@@ -320,6 +334,7 @@ fi
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
 %{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
 
@@ -342,6 +357,9 @@ fi
 %{_libdir}/libgweather.so
 
 %changelog
+* Sat Sep 22 2007 David Woodhouse <dwmw2@infradead.org> - 1.2.20.0-4
+- Build modemlights applet again (#301601)
+
 * Sat Sep 22 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.20.0-3
 - Make the gweather.pc file less useless
 
diff --git a/ppp-includes.patch b/ppp-includes.patch
index 75d3dc9..a3056c8 100644
--- a/ppp-includes.patch
+++ b/ppp-includes.patch
@@ -1,10 +1,11 @@
 diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
 --- gnome-applets-2.19.0/modemlights/modemlights.c.includes	2007-07-30 18:05:02.000000000 -0400
 +++ gnome-applets-2.19.0/modemlights/modemlights.c	2007-07-30 18:05:13.000000000 -0400
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,8 @@
  #endif
  
  #ifdef __linux__
++#define aligned_u64 unsigned long long __attribute__((aligned(8)))
 +#include <linux/types.h>
  #include <linux/if_ppp.h>
  #include <sys/ioctl.h>
diff --git a/sources b/sources
index c42e0ba..e7c7830 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 985cfc3c58a72e1a92201bf4a4873b87  gnome-applets-2.20.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2