diff -Nru mountall-2.36.4ubuntu0.1/src/mountall.c mountall-2.36.5ubuntu0/src/mountall.c
--- mountall-2.36.4ubuntu0.1/src/mountall.c	2013-01-14 23:44:09.000000000 +0000
+++ mountall-2.36.5ubuntu0/src/mountall.c	2015-07-09 17:42:11.498401830 +0100
@@ -1321,11 +1321,12 @@
 			nih_debug ("%s is root filesystem", MOUNT_NAME (mnt));
 			tag = TAG_LOCAL;
 		} else if (is_remote (mnt)) {
-			if ((! strcmp (mnt->mountpoint, "/usr"))
-			    || (! strcmp (mnt->mountpoint, "/var"))
-			    || (! strncmp (mnt->mountpoint, "/usr/", 5))
-			    || (! strncmp (mnt->mountpoint, "/var/", 5))
-			    || (has_option (mnt, "bootwait", FALSE)))
+			if (((! strcmp (mnt->mountpoint, "/usr"))
+			     || (! strcmp (mnt->mountpoint, "/var"))
+			     || (! strncmp (mnt->mountpoint, "/usr/", 5))
+			     || (! strncmp (mnt->mountpoint, "/var/", 5))
+			     || (has_option (mnt, "bootwait", FALSE)))
+			    && ! has_option (mnt, "nobootwait", FALSE))
 			{
 				tag = TAG_REMOTE;
 			} else {