diff --git a/src/structs.h b/src/structs.h
index 46e27012c89c5..851ee6310e40a 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1290,6 +1290,10 @@ typedef long_u hash_T;		// Type for hi_hash
 # endif
 #endif
 
+// On rare systems "char" is unsigned, sometimes we really want a signed 8-bit
+// value.
+typedef signed char int8_T;
+
 typedef double	float_T;
 
 typedef struct listvar_S list_T;
@@ -1342,7 +1346,7 @@ typedef enum
 typedef struct type_S type_T;
 struct type_S {
     vartype_T	    tt_type;
-    char	    tt_argcount;    // for func, -1 for unknown
+    int8_T	    tt_argcount;    // for func, -1 for unknown
     char	    tt_min_argcount; // number of non-optional arguments
     char	    tt_flags;	    // TTFLAG_ values
     type_T	    *tt_member;	    // for list, dict, func return type
diff --git a/src/version.c b/src/version.c
index a3c54cb85c7d9..2caae75d11c6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    530,
 /**/
     529,
 /**/