diff --git a/commands/automount.c b/commands/automount.c
index 8c0e4de..aa1e417 100644
--- a/commands/automount.c
+++ b/commands/automount.c
@@ -27,9 +27,9 @@
 
 static int do_automount(int argc, char *argv[])
 {
-	int opt, ret;
+	int opt, ret, make_dir = 0;
 
-	while ((opt = getopt(argc, argv, "lr:")) > 0) {
+	while ((opt = getopt(argc, argv, "lr:d")) > 0) {
 		switch (opt) {
 		case 'l':
 			automount_print();
@@ -37,12 +37,21 @@
 		case 'r':
 			automount_remove(optarg);
 			return 0;
+		case 'd':
+			make_dir = 1;
+			break;
 		}
 	}
 
 	if (optind + 2 != argc)
 		return COMMAND_ERROR_USAGE;
 
+	if (make_dir) {
+		ret = make_directory(argv[optind]);
+		if (ret)
+			return ret;
+	}
+
 	ret = automount_add(argv[optind], argv[optind + 1]);
 	if (ret)
 		printf("adding automountpoint failed: %s\n",