diff --git a/src/Makefile b/src/Makefile
index 19f2a3fbf0..6fb1eb95e2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3120,7 +3120,7 @@ auto/pathdef.c: Makefile auto/config.mk
 	-@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
 	-@if test -n "$(COMPILEDBY)"; then \
 		echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
-		else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi
+		else (logname 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi
 	-@echo '";' >> $@
 	-@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@
 	-@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi
diff --git a/src/version.c b/src/version.c
index 50a40d38a8..e9ff82a997 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1855,
 /**/
     1854,
 /**/