diff --git a/src/optionstr.c b/src/optionstr.c
index ad1dc81a84..326e625526 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -2956,7 +2956,7 @@ did_set_mousemodel(optset_T *args UNUSED)
     if (check_opt_strings(p_mousem, p_mousem_values, FALSE) != OK)
 	return e_invalid_argument;
 #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU) && (XmVersion <= 1002)
-    else if (*p_mousem != *oldval)
+    else if (*p_mousem != *args->os_oldval.string)
 	// Changed from "extend" to "popup" or "popup_setpos" or vv: need
 	// to create or delete the popup menus.
 	gui_motif_update_mousemodel(root_menu);
diff --git a/src/version.c b/src/version.c
index 78fb3e01f6..e65c2310cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2176,
 /**/
     2175,
 /**/