--- gnome-applets-2.18.0/accessx-status/GNOME_AccessxStatusApplet.server.in.in.bug-buddy	2007-03-31 18:34:54.000000000 -0400
+++ gnome-applets-2.18.0/accessx-status/GNOME_AccessxStatusApplet.server.in.in	2007-03-31 18:40:05.000000000 -0400
@@ -27,7 +27,8 @@
 	<oaf_attribute name="panel:icon" type="string" value="ax-applet"/>
 	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
         <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-        <oaf_attribute name="bugzilla:component" type="string" value="other-applets"/>
+        <oaf_attribute name="bugzilla:component" type="string" value="keyboard-accessibility (accessx-status)"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="accessx-status-applet"/>
 
 </oaf_server>
 
--- gnome-applets-2.18.0/gswitchit/Makefile.in.bug-buddy	2007-03-12 09:04:25.000000000 -0400
+++ gnome-applets-2.18.0/gswitchit/Makefile.in	2007-03-31 18:34:20.000000000 -0400
@@ -959,7 +959,7 @@
 
 
 $(server_in_files): $(server_in_in_files) 
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
--- gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in.bug-buddy	2006-12-30 21:07:52.000000000 -0500
+++ gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in	2007-03-31 18:34:20.000000000 -0400
@@ -10,6 +10,11 @@
         </oaf_attribute>
         <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
         <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
+        <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+        <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
+        <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
 
 </oaf_server>
 
@@ -25,6 +30,11 @@
         <oaf_attribute name="name" type="string" _value="Keyboard Indicator"/>
         <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
         <oaf_attribute name="panel:icon" type="string" value="gswitchit-applet.png"/>
+        <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
+        <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
+        <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
 
 </oaf_server>
 
--- gnome-applets-2.18.0/gswitchit/Makefile.am.bug-buddy	2006-12-30 21:07:52.000000000 -0500
+++ gnome-applets-2.18.0/gswitchit/Makefile.am	2007-03-31 18:34:20.000000000 -0400
@@ -49,7 +49,7 @@
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_in_files) 
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
 
 CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA)