diff --git a/src/version.c b/src/version.c
index 379980a4f8..32c39be5d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1420,
 /**/
     1419,
 /**/
diff --git a/src/xdiff/xmacros.h b/src/xdiff/xmacros.h
index 8487bb396f..f58cf08e73 100644
--- a/src/xdiff/xmacros.h
+++ b/src/xdiff/xmacros.h
@@ -24,7 +24,11 @@
 #define XMACROS_H
 
 
-
+#ifdef __hpux
+# ifndef SIZE_MAX
+#  define SIZE_MAX ((size_t)(-1))
+# endif
+#endif
 
 #define XDL_MIN(a, b) ((a) < (b) ? (a): (b))
 #define XDL_MAX(a, b) ((a) > (b) ? (a): (b))