diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 5af3bf20c..2062a004a 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -2,7 +2,7 @@
 	Neutrino-GUI  -   DBoxII-Project
 
 	Copyright (C) 2001 Steffen Hehn 'McClean'
-	Copyright (C) 2010-2014 Stefan Seyfried
+	Copyright (C) 2010-2015 Stefan Seyfried
 	Copyright (C) 2013-2014 martii
 	Copyright (C) 2009-2014 CoolStream International Ltd
 
@@ -389,11 +389,18 @@ int CHDDMenuHandler::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t dat
 		if (!split_config_string(str, smap))
 			return messages_return::handled;
 
+		std::string dev;
 		std::map<std::string,std::string>::iterator it = smap.find("MDEV");
-		if (it == smap.end())
-			return messages_return::handled;
-
-		std::string dev = it->second;
+		if (it != smap.end())
+			dev = it->second;
+		else {
+			it = smap.find("DEVNAME");
+			if (it == smap.end())
+				return messages_return::handled;
+			dev = it->second;
+			if (dev.length() > 5)
+				dev = dev.substr(5); /* strip off /dev/ */
+		}
 		printf("CHDDMenuHandler::handleMsg: MDEV=%s\n", dev.c_str());
 		if (!filterDevName(dev.c_str()))
 			return messages_return::handled;
diff --git a/src/mdev_helper.cpp b/src/mdev_helper.cpp
index 26d35d781..7fd3659d4 100644
--- a/src/mdev_helper.cpp
+++ b/src/mdev_helper.cpp
@@ -37,10 +37,10 @@ const char *mdev_env[] =
 	"MDEV" ,
 	"DEVPATH" ,
 	"INTERFACE",
+	"DEVNAME",
+	NULL /* terminating entry */
 };
 
-#define ENV_SIZE (sizeof(mdev_env)/sizeof(char *))
-
 int main (int /*argc*/, char **argv)
 {
 	struct sockaddr_un servaddr;
@@ -64,7 +64,7 @@ int main (int /*argc*/, char **argv)
 		goto _error;
 	}
 
-	for (unsigned i = 0; i < ENV_SIZE; i++) {
+	for (unsigned i = 0; mdev_env[i]; i++) {
 		char * s = getenv(mdev_env[i]);
 		if (s)
 			data += std::string(mdev_env[i]) + "=" + s + " ";