diff --git a/ChangeLog b/ChangeLog
index 166b2a5c..7f6db96d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-03 22:34  psychotrahe
+
+	* plugins/check_disk.c: - Fix partition selection if if last
+	  argument is a pathname/device without using -p
+
 2007-04-10 08:17  dermoth
 
 	* po/: POTFILES.in, de.po, fr.po, nagios-plugins.pot: Add some
diff --git a/THANKS.in b/THANKS.in
index c9d604b4..b0ed31b7 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -217,3 +217,4 @@ Mark Favas
 Felix Frank
 Denis Knauf
 Matthias Flacke
+Emil Michles
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 4872efca..c32c7ab3 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -734,6 +734,7 @@ process_arguments (int argc, char **argv)
 
   if (argc > c && path == NULL) {
     se = np_add_parameter(&path_select_list, strdup(argv[c++]));
+    path_selected = true;
     set_all_thresholds(se);
   }