diff --git a/gnome-power-manager-2.18.1-bug-buddy.patch b/gnome-power-manager-2.18.1-bug-buddy.patch
new file mode 100644
index 0000000..d98967a
--- /dev/null
+++ b/gnome-power-manager-2.18.1-bug-buddy.patch
@@ -0,0 +1,94 @@
+--- gnome-power-manager-2.18.1/applets/brightness/Makefile.in.bug-buddy	2007-03-31 18:16:07.000000000 -0400
++++ gnome-power-manager-2.18.1/applets/brightness/Makefile.in	2007-03-31 18:17:29.000000000 -0400
+@@ -708,7 +708,7 @@
+ 
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
++	sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- gnome-power-manager-2.18.1/applets/brightness/GNOME_BrightnessApplet.server.in.in.bug-buddy	2007-03-31 18:15:09.000000000 -0400
++++ gnome-power-manager-2.18.1/applets/brightness/GNOME_BrightnessApplet.server.in.in	2007-03-31 18:15:52.000000000 -0400
+@@ -8,6 +8,11 @@
+     </oaf_attribute>
+     <oaf_attribute name="name" type="string" value="Brightness Applet Factory"/>
+     <oaf_attribute name="description" type="string" value="Factory for Brightness Applet"/>
++    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++    <oaf_attribute name="bugzilla:product" type="string" value="gnome-power-manager"/>
++    <oaf_attribute name="bugzilla:component" type="string" value="applets"/>
++    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-brightness-applet"/>
+   </oaf_server>
+   <oaf_server iid="OAFIID:GNOME_BrightnessApplet" type="factory" location="OAFIID:GNOME_BrightnessApplet_Factory">
+     <oaf_attribute name="repo_ids" type="stringv">
+@@ -19,5 +24,10 @@
+     <oaf_attribute name="panel:icon" type="string" value="gpm-brightness-lcd"/>
+     <oaf_attribute name="name" type="string" value="Brightness Applet"/>
+     <oaf_attribute name="description" type="string" value="Adjusts Laptop panel brightness"/>
++    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++    <oaf_attribute name="bugzilla:product" type="string" value="gnome-power-manager"/>
++    <oaf_attribute name="bugzilla:component" type="string" value="applets"/>
++    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-brightness-applet"/>
+   </oaf_server>
+ </oaf_info>
+--- gnome-power-manager-2.18.1/applets/brightness/Makefile.am.bug-buddy	2007-03-31 18:16:00.000000000 -0400
++++ gnome-power-manager-2.18.1/applets/brightness/Makefile.am	2007-03-31 18:16:53.000000000 -0400
+@@ -32,7 +32,7 @@
+ server_DATA     = $(server_in_files:.server.in=.server)
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
++	sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ 
+--- gnome-power-manager-2.18.1/applets/inhibit/GNOME_InhibitApplet.server.in.in.bug-buddy	2007-03-31 18:17:54.000000000 -0400
++++ gnome-power-manager-2.18.1/applets/inhibit/GNOME_InhibitApplet.server.in.in	2007-03-31 18:18:48.000000000 -0400
+@@ -8,6 +8,11 @@
+     </oaf_attribute>
+     <oaf_attribute name="name" type="string" value="Inhibit Applet Factory"/>
+     <oaf_attribute name="description" type="string" value="Factory for Inhibit Applet"/>
++    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++    <oaf_attribute name="bugzilla:product" type="string" value="gnome-power-manager"/>
++    <oaf_attribute name="bugzilla:component" type="string" value="applets"/>
++    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-inhibit-applet"/>
+   </oaf_server>
+   <oaf_server iid="OAFIID:GNOME_InhibitApplet" type="factory" location="OAFIID:GNOME_InhibitApplet_Factory">
+     <oaf_attribute name="repo_ids" type="stringv">
+@@ -19,5 +24,10 @@
+     <oaf_attribute name="panel:icon" type="string" value="gpm-suspend"/>
+     <oaf_attribute name="name" type="string" value="Inhibit Applet"/>
+     <oaf_attribute name="description" type="string" value="Allows user to inhibit automatic power saving"/>
++    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++    <oaf_attribute name="bugzilla:product" type="string" value="gnome-power-manager"/>
++    <oaf_attribute name="bugzilla:component" type="string" value="applets"/>
++    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-inhibit-applet"/>
+   </oaf_server>
+ </oaf_info>
+--- gnome-power-manager-2.18.1/applets/inhibit/Makefile.in.bug-buddy	2007-03-31 18:18:10.000000000 -0400
++++ gnome-power-manager-2.18.1/applets/inhibit/Makefile.in	2007-03-31 18:19:47.000000000 -0400
+@@ -707,7 +707,7 @@
+ 
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
++	sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- gnome-power-manager-2.18.1/applets/inhibit/Makefile.am.bug-buddy	2007-03-31 18:18:02.000000000 -0400
++++ gnome-power-manager-2.18.1/applets/inhibit/Makefile.am	2007-03-31 18:19:14.000000000 -0400
+@@ -32,7 +32,7 @@
+ server_DATA     = $(server_in_files:.server.in=.server)
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
++	sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ 
diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 16867e1..fc6487b 100644
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -5,12 +5,14 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.18/gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.15.4-nodefaultbeep.patch
 Patch1: gnome-power-manager-2.17.92-dpms-query-less.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=425000
+Patch2: gnome-power-manager-2.18.1-bug-buddy.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -47,6 +49,7 @@ change preferences.
 %setup -q
 %patch0 -p1 -b .nodefaultbeep
 %patch1 -p1 -b .dpms-query
+%patch2 -p1 -b .bug-buddy
 
 %build
 %configure \
@@ -123,6 +126,9 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Sat Mar 31 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.1-2
+- Add bug-buddy support to the applets 
+
 * Fri Mar 23 2007 Ray Strode <rstrode@redhat.com> - 2.18.1-1
 - Update to 2.18.1