diff --git a/[refs] b/[refs]
index b3010a4acbf6..d563db7ddf65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eff2e7a8b65c25920207324e56611150eb1cd9a
+refs/heads/master: 6a8d8abb6e4497ae4132a9b1f0a956ea501f1c46
diff --git a/trunk/drivers/base/Kconfig b/trunk/drivers/base/Kconfig
index 5d6312e33490..d7da109c24fd 100644
--- a/trunk/drivers/base/Kconfig
+++ b/trunk/drivers/base/Kconfig
@@ -1,5 +1,13 @@
 menu "Generic Driver Options"
 
+config UEVENT_HELPER_PATH
+	string "path to uevent helper"
+	depends on HOTPLUG
+	default "/sbin/hotplug"
+	help
+	  Path to uevent helper program forked by the kernel for
+	  every uevent.
+
 config STANDALONE
 	bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
 	default y
diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c
index 7d8aeb301635..5ccda460262c 100644
--- a/trunk/lib/kobject_uevent.c
+++ b/trunk/lib/kobject_uevent.c
@@ -35,7 +35,7 @@ const char *kobject_actions[] = {
 
 #if defined(CONFIG_HOTPLUG)
 u64 uevent_seqnum;
-char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
 static DEFINE_SPINLOCK(sequence_lock);
 #if defined(CONFIG_NET)
 static struct sock *uevent_sock;