diff --git a/audacious-plugins-2.2-alarm.patch b/audacious-plugins-2.2-alarm.patch
new file mode 100644
index 0000000..12c9ae6
--- /dev/null
+++ b/audacious-plugins-2.2-alarm.patch
@@ -0,0 +1,43 @@
+diff -Nur audacious-plugins-2.2-orig/src/alarm/alarm.c audacious-plugins-2.2/src/alarm/alarm.c
+--- audacious-plugins-2.2-orig/src/alarm/alarm.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/alarm/alarm.c	2009-12-30 22:38:17.985756827 +0100
+@@ -321,14 +321,17 @@
+    if(!aud_cfg_db_get_int(conf, "alarm", "fading", &fading))
+      fading = DEFAULT_FADING;
+ 
++   g_free(cmdstr);
+    if(!aud_cfg_db_get_string(conf, "alarm", "cmdstr", &cmdstr))
+      cmdstr = g_strdup("");
+    if(!aud_cfg_db_get_bool(conf, "alarm", "cmd_on", &cmd_on))
+      cmd_on = FALSE;
+ 
++   g_free(playlist);
+    if(!aud_cfg_db_get_string(conf, "alarm", "playlist", &playlist))
+      playlist = g_strdup("");
+ 
++   g_free(alarm_conf.reminder_msg);
+    if(!aud_cfg_db_get_string(conf, "alarm", "reminder_msg", &alarm_conf.reminder_msg))
+      alarm_conf.reminder_msg = g_strdup("");
+    if(!aud_cfg_db_get_bool(conf, "alarm", "reminder_on", &alarm_conf.reminder_on))
+@@ -970,6 +973,7 @@
+ {
+    DEBUG("alarm_init\n");
+ 
++   alarm_conf.reminder_msg = NULL;
+    alarm_read_config();
+ 
+    /* start the main thread running */
+@@ -989,6 +993,13 @@
+    if(stop_tid)
+      pthread_cancel(stop_tid);
+    stop_tid = 0;
++
++   g_free(alarm_conf.reminder_msg);
++   alarm_conf.reminder_msg = NULL;
++   g_free(playlist);
++   playlist = NULL;
++   g_free(cmdstr);
++   cmdstr = NULL;
+ }
+ 
+ static GeneralPlugin alarm_plugin =
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index e968f60..911220d 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -27,10 +27,12 @@ Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
 Patch1: audacious-plugins-2.2-jack.patch
 #
 Patch2: audacious-plugins-2.2-neon-request.patch
-# submitted upstream
+# merged upstream
 Patch3: audacious-plugins-2.2-cfg_db_close.patch
-# submitted upstream
+# merged upstream
 Patch4: audacious-plugins-2.2-bluetooth.patch
+# merged upstream
+Patch5: audacious-plugins-2.2-alarm.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -166,6 +168,7 @@ in Vortex (.vtx) format.
 %patch2 -p1 -b .neon-request
 %patch3 -p1 -b .cfg_db_close
 %patch4 -p1 -b .bluetooth
+%patch5 -p1 -b .alarm
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -259,6 +262,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Dec 30 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-6
+- Fix the alarm plugin.
+
 * Fri Dec 25 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-5
 - Remove BR libtimidity-devel as that plugin is no longer available.