diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index f0459a8dc..006ab82ce 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -75,7 +75,7 @@ const CMenuOptionChooser::keyval HDD_FILESYS_OPTIONS[HDD_FILESYS_OPTION_COUNT] =
 const CMenuOptionChooser::keyval HDD_SLEEP_OPTIONS[HDD_SLEEP_OPTION_COUNT] =
 {
 	{ 0,   LOCALE_OPTIONS_OFF },
-	{ 12,  LOCALE_HDD_1MIN },
+	//{ 12,  LOCALE_HDD_1MIN },
 	{ 60,  LOCALE_HDD_5MIN },
 	{ 120, LOCALE_HDD_10MIN },
 	{ 240, LOCALE_HDD_20MIN },
@@ -277,6 +277,9 @@ int CHDDDestExec::exec(CMenuTarget* /*parent*/, const std::string&)
 	const char hdidle[] = "/sbin/hd-idle";
 	bool have_hdidle = !access(hdidle, X_OK);
 
+	if (g_settings.hdd_sleep < 60)
+		g_settings.hdd_sleep = 60;
+
 	if (have_hdidle) {
 		system("kill $(pidof hd-idle)");
 		int sleep_seconds = g_settings.hdd_sleep;
@@ -516,7 +519,11 @@ _remount:
         }
 	f = fopen("/proc/sys/kernel/hotplug", "w");
 	if(f) {
+#ifdef ASSUME_MDEV
+		fprintf(f, "/sbin/mdev\n");
+#else
 		fprintf(f, "/sbin/hotplug\n");
+#endif
 		fclose(f);
 	}