diff --git a/lxpanel-0.5.12-battery-plugin-use-zenity.patch b/lxpanel-0.5.12-battery-plugin-use-zenity.patch
new file mode 100644
index 0000000..fae3dad
--- /dev/null
+++ b/lxpanel-0.5.12-battery-plugin-use-zenity.patch
@@ -0,0 +1,11 @@
+--- lxpanel-0.5.12.orig/src/plugins/batt/batt.c	2013-01-15 05:32:35.000000000 +0100
++++ lxpanel-0.5.12/src/plugins/batt/batt.c	2013-07-03 18:37:07.111010588 +0200
+@@ -436,7 +436,7 @@
+ 
+     /* Apply more default options */
+     if (! lx_b->alarmCommand)
+-        lx_b->alarmCommand = g_strdup("xmessage Battery low");
++        lx_b->alarmCommand = g_strdup("zenity --warning --text='Battery low'");
+     if (! lx_b->backgroundColor)
+         lx_b->backgroundColor = g_strdup("black");
+     if (! lx_b->chargingColor1)
diff --git a/lxpanel.spec b/lxpanel.spec
index 1dc7218..d34d8f5 100644
--- a/lxpanel.spec
+++ b/lxpanel.spec
@@ -2,7 +2,7 @@
 
 Name:           lxpanel
 Version:        0.5.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A lightweight X11 desktop panel
 
 Group:          User Interface/Desktops
@@ -27,6 +27,9 @@ Patch2:         lxpanel-0.5.12-fix-flash_window_timeout.patch
 Patch100:       lxpanel-0.5.9-default.patch
 # use nm-connection-editor to edit network connections
 Patch101:       lxpanel-0.3.8.1-nm-connection-editor.patch
+# use zenity instead of xmessage to display low battery warning
+Patch102:       lxpanel-0.5.12-battery-plugin-use-zenity.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +45,8 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  wireless-tools-devel
 BuildRequires:  pkgconfig(libmenu-cache) >= 0.3.0
 BuildRequires:  pkgconfig(libwnck-1.0)
+# required for the battery plugin with Patch102
+Requires:       zenity
 
 
 %description
@@ -68,6 +73,7 @@ developing applications that use %{name}.
 
 %patch100 -p1 -b .default
 %patch101 -p1 -b .system-config-network
+%patch102 -p1 -b .zenity
 
 # Fedora >= 19 doesn't use vendor prefixes for desktop files. Instead of
 # maintaining two patches we just strip the prefixes from the files we just
@@ -108,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/lxpanel.pc
 
 %changelog
+* Wed Aug 03 2013 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.13-3
+- Use zenity instead of xmessage to display low battery warnings
+
 * Sun May 12 2013 Christoph Wickert <cwickert@fedoraproject.org> - 0.5.12-2
 - Another patch for to fix the "flash_window_timeout" crash (#587430)
 - Make sure launchers in default config work on Fedora >= 19