diff --git a/src/normal.c b/src/normal.c
index aa470e4..a730116 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2279,6 +2279,7 @@
 {
 #ifdef FEAT_EVAL
     char_u	*(argv[1]);
+    int		save_virtual_op = virtual_op;
 
     if (*p_opfunc == NUL)
 	EMSG(_("E774: 'operatorfunc' is empty"));
@@ -2297,7 +2298,14 @@
 	    argv[0] = (char_u *)"line";
 	else
 	    argv[0] = (char_u *)"char";
+
+	/* Reset virtual_op so that 'virtualedit' can be changed in the
+	 * function. */
+	virtual_op = MAYBE;
+
 	(void)call_func_retnr(p_opfunc, 1, argv, FALSE);
+
+	virtual_op = save_virtual_op;
     }
 #else
     EMSG(_("E775: Eval feature not available"));
diff --git a/src/version.c b/src/version.c
index 2598aeb..a1bd77c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    481,
+/**/
     480,
 /**/
     479,