diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
--- /dev/null	2009-01-06 09:07:59.720027856 -0500
+++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-06 13:06:52.000000000 -0500
@@ -0,0 +1,22 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_BattstatApplet"
+	    type="factory" 
+	    location="OAFIID:GNOME_NullApplet_Factory">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+		<item value="IDL:Bonobo/Control:1.0"/>
+		<item value="IDL:Bonobo/Unknown:1.0"/>
+	</oaf_attribute>
+	<oaf_attribute name="name" type="string" _value="Battery Charge Monitor"/>
+	<oaf_attribute name="description" type="string" _value="Monitor a laptop's remaining power"/>
+	<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="battery"/>
+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="battstat-applet-2"/>
+
+
+</oaf_server>
+
+</oaf_info>
diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
--- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null	2009-01-06 00:30:23.000000000 -0500
+++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-06 13:08:41.000000000 -0500
@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
 
 null_applet_LDADD = $(GNOME_APPLETS_LIBS)
 
+if !BUILD_BATTSTAT_APPLET
+battstat_applet=GNOME_BattstatApplet.server.in
+endif
+
 serverdir = $(libdir)/bonobo/servers
 server_in_files =				\
 	GNOME_NullApplet_Factory.server.in	\
 	GNOME_CDPlayerApplet.server.in		\
 	GNOME_MailcheckApplet_Factory.server.in	\
-	GNOME_Panel_WirelessApplet.server.in	\
 	GNOME_MixerApplet.server.in
 server_DATA = $(server_in_files:.server.in=.server)
 
diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
--- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null	2009-01-06 00:30:23.000000000 -0500
+++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-06 13:09:42.000000000 -0500
@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
 	g_hash_table_insert (hash_table,
 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
 	g_hash_table_insert (hash_table,
+			"OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+	g_hash_table_insert (hash_table,
 			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
 }