Index: sbin/tunefs/tunefs.c
===================================================================
--- sbin/tunefs/tunefs.c	(revision 208584)
+++ sbin/tunefs/tunefs.c	(working copy)
@@ -341,16 +341,19 @@
 	if (jflag) {
  		name = "soft updates journaling";
  		if (strcmp(jvalue, "enable") == 0) {
-			if ((sblock.fs_flags & (FS_DOSOFTDEP | FS_SUJ)) ==
-			    (FS_DOSOFTDEP | FS_SUJ)) {
+			if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) {
 				warnx("%s remains unchanged as enabled", name);
+			} else if ((sblock.fs_flags & FS_DOSOFTDEP) !=
+				FS_DOSOFTDEP) {
+				warnx("%s cannot be enabled until soft updates is enabled",
+					name);
 			} else if (sblock.fs_clean == 0) {
 				warnx("%s cannot be enabled until fsck is run",
 				    name);
 			} else if (journal_alloc(Svalue) != 0) {
 				warnx("%s can not be enabled", name);
 			} else {
- 				sblock.fs_flags |= FS_DOSOFTDEP | FS_SUJ;
+ 				sblock.fs_flags |= FS_SUJ;
  				warnx("%s set", name);
 			}
  		} else if (strcmp(jvalue, "disable") == 0) {
@@ -459,6 +462,9 @@
  		} else if (strcmp(nvalue, "disable") == 0) {
 			if ((~sblock.fs_flags & FS_DOSOFTDEP) == FS_DOSOFTDEP)
 				warnx("%s remains unchanged as disabled", name);
+			else if ((sblock.fs_flags & FS_SUJ) == FS_SUJ)
+				warnx("%s cannot be enabled until soft updates \
+journaling is disabled", name);
 			else {
  				sblock.fs_flags &= ~FS_DOSOFTDEP;
  				warnx("%s cleared", name);