diff --git a/gnome-applets-2.16.0.1-fix-null-applet.patch b/gnome-applets-2.16.0.1-fix-null-applet.patch
deleted file mode 100644
index 48b3393..0000000
--- a/gnome-applets-2.16.0.1-fix-null-applet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-2.21.4-cpufreq.patch b/gnome-applets-2.21.4-cpufreq.patch
new file mode 100644
index 0000000..fadbdbc
--- /dev/null
+++ b/gnome-applets-2.21.4-cpufreq.patch
@@ -0,0 +1,38 @@
+diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c
+--- gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq	2008-01-03 15:36:29.000000000 -0500
++++ gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c	2008-01-16 01:28:07.000000000 -0500
+@@ -109,6 +109,9 @@ cpufreq_utils_selector_is_available (voi
+ 	if (!path)
+ 		return FALSE;
+ 
++	g_free (path);
++	return TRUE;
++
+ 	if (geteuid () == 0) {
+ 		g_free (path);
+ 		return TRUE;
+diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c
+--- gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq	2008-01-03 15:36:29.000000000 -0500
++++ gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c	2008-01-16 01:27:14.000000000 -0500
+@@ -176,20 +176,13 @@ static void
+ cpufreq_popup_run_selector (CPUFreqPopup *popup,
+ 			    const gchar  *params)
+ {
+-	gchar  *path;
+ 	guint   cpu;
+ 	gchar  *command;
+ 	GError *error = NULL;
+ 
+-	path = g_find_program_in_path ("cpufreq-selector");
+-
+-	if (!path)
+-		return;
+-
+ 	cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
+ 
+-	command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
+-	g_free (path);
++	command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
+ 
+ 	g_spawn_command_line_async (command, &error);
+ 	g_free (command);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ee56aea..b089f31 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -49,12 +49,9 @@ 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
+Patch4:		gnome-applets-2.21.4-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=395035
-Patch30:	gnome-applets-2.16.0.1-fix-null-applet.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=424639
 Patch31:        gnome-applets-2.18.0-fix-find.patch
 
@@ -172,7 +169,6 @@ libraries contained in the gnome-applets package.
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
 
-%patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
 %patch35 -p1 -b .mixer-sync