diff --git a/gnome-applets-2.16.0.1-fix-null-applet.patch b/gnome-applets-2.16.0.1-fix-null-applet.patch
new file mode 100644
index 0000000..48b3393
--- /dev/null
+++ b/gnome-applets-2.16.0.1-fix-null-applet.patch
@@ -0,0 +1,11 @@
+--- gnome-applets-2.16.0.1/null_applet/null_applet.c.fix-null-applet	2006-12-15 17:09:57.000000000 -0500
++++ gnome-applets-2.16.0.1/null_applet/null_applet.c	2006-12-15 17:10:55.000000000 -0500
+@@ -83,7 +83,7 @@
+ 
+ 	for (l = list; l; l = l->next)
+ 	{
+-		key = g_strdup_printf ("%p/bonobo_iid", l->data);
++		key = g_strdup_printf ("%s/bonobo_iid", l->data);
+ 		oafiid = gconf_client_get_string (client, key, &error);
+ 		if (error)
+ 		{
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 3e97e1f..a30ffa0 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.16.2
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -68,6 +68,9 @@ Patch28: gnome-applets-2.16.2-trash-screen.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919
 Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=395035
+Patch30: gnome-applets-2.16.0.1-fix-null-applet.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -161,6 +164,7 @@ small utilities for the GNOME panel.
 
 %patch28 -p1 -b .trash-screen
 %patch29 -p1 -b .delay-gstreamer-initialization
+%patch30 -p1 -b .fix-null-applet
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -347,6 +351,9 @@ fi
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Jan 10 2007 Ray Strode <rstrode@redhat.com> - 1:2.16.2-6
+- fix null applet error on login for new users (bug 222104)
+
 * Tue Dec 12 2006 Ray Strode <rstrode@redhat.com> - 1:2.16.2-5
 - fix mixer applet error on login for new users (bug 217919)