Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 1275)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 1276)
@@ -845,6 +845,12 @@
 
 REGISTER_FLAGS(vendor_flag_list, vendor_cookie)
 
+static void hid_vendordrill_uninit(void)
+{
+	hid_remove_actions_by_cookie(vendor_cookie);
+	hid_remove_flags_by_cookie(vendor_cookie);
+}
+
 #include "dolists.h"
 pcb_uninit_t hid_vendordrill_init(void)
 {
@@ -853,5 +859,5 @@
 
 	REGISTER_ACTIONS(vendor_action_list, vendor_cookie)
 	REGISTER_FLAGS(vendor_flag_list, vendor_cookie)
-	return NULL;
+	return hid_vendordrill_uninit;
 }