diff --git a/src/option.c b/src/option.c
index 141329121b..6eb7903295 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4006,7 +4006,7 @@ do_set(arg, opt_flags)
 	else
 	{
 	    prefix = 1;
-	    if (STRNCMP(arg, "no", 2) == 0)
+	    if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
 	    {
 		prefix = 0;
 		arg += 2;
@@ -9757,7 +9757,7 @@ set_context_in_set_cmd(xp, arg, opt_flags)
 	}
 	--p;
     }
-    if (STRNCMP(p, "no", 2) == 0)
+    if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
     {
 	xp->xp_context = EXPAND_BOOL_SETTINGS;
 	p += 2;
diff --git a/src/version.c b/src/version.c
index 2ec6a6a9df..044b2fdd4d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    208,
 /**/
     207,
 /**/