diff --git a/src/option.c b/src/option.c
index 48106411f3..61d3579834 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4927,6 +4927,8 @@ do_set(
 					break;
 				}
 				vim_free(oldval);
+				if (origval == oldval)
+				    origval = *(char_u **)varp;
 				oldval = *(char_u **)varp;
 			    }
 			    /*
diff --git a/src/version.c b/src/version.c
index d5df161533..36af209685 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    975,
 /**/
     974,
 /**/