diff --git a/ANNOUNCE b/ANNOUNCE
index d15aff2aa..1ceff7d69 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta22 - November 2, 2013
+Libpng 1.7.0beta22 - November 4, 2013
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -414,7 +414,9 @@ Version 1.7.0beta21 [November 2, 2013]
     PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1).  This macro
     is undefined by default and the build type is selected in pngpriv.h.
 
-Version 1.7.0beta22 [November 2, 2013]
+Version 1.7.0beta22 [November 4, 2013]
+  Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char
+    checking macros take an unsigned char argument, not a signed char.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index f7336ef49..19eedf9ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4703,7 +4703,9 @@ Version 1.7.0beta21 [November 2, 2013]
     PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1).  This macro
     is undefined by default and the build type is selected in pngpriv.h.
 
-Version 1.7.0beta22 [November 2, 2013]
+Version 1.7.0beta22 [November 4, 2013]
+  Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char
+    checking macros take an unsigned char argument, not a signed char.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c
index ba39d61f3..2246d7143 100644
--- a/arm/filter_neon_intrinsics.c
+++ b/arm/filter_neon_intrinsics.c
@@ -12,7 +12,7 @@
  * and license in png.h
  */
 
-#include "pngpriv.h"
+#include "../pngpriv.h"
 
 /* This code requires -mfpu=neon on the command line: */
 #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code */
diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c
index 4aea2a849..54c19aac9 100644
--- a/contrib/tools/pngfix.c
+++ b/contrib/tools/pngfix.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <limits.h>
 #include <errno.h>
 #include <assert.h>
 
@@ -908,10 +909,10 @@ emit_string(const char *str, FILE *out)
     */
 {
    for (; *str; ++str)
-      if (isgraph(*str))
+      if (isgraph(UCHAR_MAX & *str))
          putc(*str, out);
 
-      else if (isspace(*str))
+      else if (isspace(UCHAR_MAX & *str))
          putc('_', out);
    
       else