diff -urN extra.orig/gnome/gnome-network-manager/01_fix_keyring_crash.patch extra/gnome/gnome-network-manager/01_fix_keyring_crash.patch
--- extra.orig/gnome/gnome-network-manager/01_fix_keyring_crash.patch	1969-12-31 16:00:00.000000000 -0800
+++ extra/gnome/gnome-network-manager/01_fix_keyring_crash.patch	2007-10-04 20:24:23.000000000 -0700
@@ -0,0 +1,11 @@
+--- src/applet-dbus-info.c	2007-06-19 21:13:01.000000000 +0100
++++ src/applet-dbus-info.c	2007-06-19 21:06:40.000000000 +0100
+@@ -103,7 +103,7 @@
+ 	char *				net_path = cb_data->net_path;
+ 	char *				essid = cb_data->essid;
+ 
+-	if (result == GNOME_KEYRING_RESULT_OK)
++	if (result == GNOME_KEYRING_RESULT_OK && found_list != NULL)
+ 	{
+ 		gchar *			escaped_network;
+ 		GnomeKeyringFound *	found;
diff -urN extra.orig/gnome/gnome-network-manager/deprecated_makefile_fix.patch extra/gnome/gnome-network-manager/deprecated_makefile_fix.patch
--- extra.orig/gnome/gnome-network-manager/deprecated_makefile_fix.patch	1969-12-31 16:00:00.000000000 -0800
+++ extra/gnome/gnome-network-manager/deprecated_makefile_fix.patch	2007-10-04 20:24:34.000000000 -0700
@@ -0,0 +1,22 @@
+diff -urN NetworkManager-0.6.5.orig/gnome/vpn-properties/Makefile.am NetworkManager-0.6.5/gnome/vpn-properties/Makefile.am
+--- NetworkManager-0.6.5.orig/gnome/vpn-properties/Makefile.am	2007-04-18 11:13:08.000000000 -0700
++++ NetworkManager-0.6.5/gnome/vpn-properties/Makefile.am	2007-10-04 20:11:32.000000000 -0700
+@@ -26,7 +26,6 @@
+         -DGLADEDIR=\""$(gladedir)"\"                    \
+         -DG_DISABLE_DEPRECATED                          \
+         -DGDK_DISABLE_DEPRECATED                        \
+-        -DGNOME_DISABLE_DEPRECATED                      \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
+         -DVERSION=\"$(VERSION)\" \
+         $(NULL)
+diff -urN NetworkManager-0.6.5.orig/gnome/vpn-properties/Makefile.in NetworkManager-0.6.5/gnome/vpn-properties/Makefile.in
+--- NetworkManager-0.6.5.orig/gnome/vpn-properties/Makefile.in	2007-04-18 13:27:40.000000000 -0700
++++ NetworkManager-0.6.5/gnome/vpn-properties/Makefile.in	2007-10-04 20:11:41.000000000 -0700
+@@ -263,7 +263,6 @@
+         -DGLADEDIR=\""$(gladedir)"\"                    \
+         -DG_DISABLE_DEPRECATED                          \
+         -DGDK_DISABLE_DEPRECATED                        \
+-        -DGNOME_DISABLE_DEPRECATED                      \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
+         -DVERSION=\"$(VERSION)\" \
+         $(NULL)
diff -urN extra.orig/gnome/gnome-network-manager/PKGBUILD extra/gnome/gnome-network-manager/PKGBUILD
--- extra.orig/gnome/gnome-network-manager/PKGBUILD	2007-04-26 10:28:06.000000000 -0700
+++ extra/gnome/gnome-network-manager/PKGBUILD	2007-10-04 20:24:45.000000000 -0700
@@ -17,12 +17,16 @@
 install=gnome-network-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${pkgver}.tar.bz2
         http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.6/network-manager-applet-${pkgver}.tar.bz2
-	policy.patch)
+	policy.patch
+	deprecated_makefile_fix.patch
+	01_fix_keyring_crash.patch)
 md5sums=('b827d300eb28458f6588eb843cba418d' '1c94a41e2399d261985a75f0cd3b895b'
-         'd5ef69a18071d9f4ba48cd0a0af243b7')
+         'd5ef69a18071d9f4ba48cd0a0af243b7' 'a340e134b4efb4ff35eaca88402ea9ab'
+         '7c00653ae40187ad46f1d0b3d2df6e7d' )
 
 build() {
   cd ${startdir}/src/NetworkManager-${pkgver}
+  patch -Np1 -i ${startdir}/src/deprecated_makefile_fix.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
         --with-distro=arch --localstatedir=/var
   make DESTDIR=${startdir}/pkg install-autostartDATA
@@ -38,6 +42,7 @@
 
   cd ${startdir}/src/nm-applet-${pkgver}
   patch -Np3 -i ${startdir}/src/policy.patch || return 1
+  patch -Np0 -i ${startdir}/src/01_fix_keyring_crash.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var
   make || return 1