diff --git a/Makefile b/Makefile
index 7a6773b1c2..3b50ec6436 100644
--- a/Makefile
+++ b/Makefile
@@ -178,6 +178,8 @@ uninstall:
 	rm -rf $(D)/usr/share/man/man1/xen*
 	rm -rf $(D)/usr/share/man/man8/xen*
 	rm -rf $(D)/usr/lib/xen
+	rm -rf $(D)/etc/hotplug.d/xen-backend
+	rm -rf $(D)/etc/hotplug/xen-backend.agent
 
 # Legacy targets for compatibility
 linux24:
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index c196978f85..c4cbf8ed94 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -27,8 +27,8 @@ XEN_SCRIPTS += block-enbd
 XEN_BOOT_DIR = /usr/lib/xen/boot
 XEN_BOOT = mem-map.sxp
 
-XEN_HOTPLUG_DIR = /etc/hotplug.d/xen-backend
-XEN_HOTPLUG_SCRIPTS = backend.hotplug
+XEN_HOTPLUG_DIR = /etc/hotplug
+XEN_HOTPLUG_SCRIPTS = xen-backend.agent
 
 all: 
 build:
diff --git a/tools/examples/backend.hotplug b/tools/examples/xen-backend.agent
similarity index 100%
rename from tools/examples/backend.hotplug
rename to tools/examples/xen-backend.agent