diff --git a/ANNOUNCE b/ANNOUNCE
index f98ed135a..23c1a52bd 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta44 - December 22, 2014
+Libpng 1.7.0beta44 - December 23, 2014
 
 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.
@@ -665,11 +665,12 @@ Version 1.7.0beta43 [December 18, 2014]
     renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
   Quiet a "comparison always true" warning in pngstest.c (John Bowler).
 
-Version 1.7.0beta44 [December 22, 2014]
+Version 1.7.0beta44 [December 23, 2014]
   Restored a test on width that was removed from png.c at libpng-1.6.9
     (Bug report by Alex Eubanks).
   Fixed an overflow in png_combine_row with very wide interlaced images.
   Corrected the width limit calculation in png_check_IHDR().
+  Removed extraneous handling of PNG_SAFE_LIMITS_SUPPORTED from pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 02e0b661d..ca95f2372 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4954,11 +4954,12 @@ Version 1.7.0beta43 [December 18, 2014]
     renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).
   Quiet a "comparison always true" warning in pngstest.c (John Bowler).
 
-Version 1.7.0beta44 [December 22, 2014]
+Version 1.7.0beta44 [December 23, 2014]
   Restored a test on width that was removed from png.c at libpng-1.6.9
     (Bug report by Alex Eubanks).
   Fixed an overflow in png_combine_row with very wide interlaced images.
   Corrected the width limit calculation in png_check_IHDR().
+  Removed extraneous handling of PNG_SAFE_LIMITS_SUPPORTED from pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index f39ca84fb..15b9ebc2b 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.7.0beta44 - December 18, 2014
+ * libpng version 1.7.0beta44 - December 23, 2014
  *
  * Copyright (c) 1998-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -22,26 +22,6 @@
 #ifndef PNGCONF_H
 #define PNGCONF_H
 
-/* To do: Do all of this in scripts/pnglibconf.dfa */
-#ifdef PNG_SAFE_LIMITS_SUPPORTED
-#  ifdef PNG_USER_WIDTH_MAX
-#    undef PNG_USER_WIDTH_MAX
-#    define PNG_USER_WIDTH_MAX 1000000L
-#  endif
-#  ifdef PNG_USER_HEIGHT_MAX
-#    undef PNG_USER_HEIGHT_MAX
-#    define PNG_USER_HEIGHT_MAX 1000000L
-#  endif
-#  ifdef PNG_USER_CHUNK_MALLOC_MAX
-#    undef PNG_USER_CHUNK_MALLOC_MAX
-#    define PNG_USER_CHUNK_MALLOC_MAX 4000000L
-#  endif
-#  ifdef PNG_USER_CHUNK_CACHE_MAX
-#    undef PNG_USER_CHUNK_CACHE_MAX
-#    define PNG_USER_CHUNK_CACHE_MAX 128
-#  endif
-#endif
-
 #ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
 
 /* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C
diff --git a/pngpriv.h b/pngpriv.h
index 092b548f5..8a0f68c2b 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -357,24 +357,24 @@
 #ifdef PNG_SAFE_LIMITS_SUPPORTED
    /* 'safe' limits */
 #  ifndef PNG_USER_WIDTH_MAX
-#     define PNG_USER_WIDTH_MAX 1000000
+#     define PNG_USER_WIDTH_MAX 1000000L
 #  endif
 #  ifndef PNG_USER_HEIGHT_MAX
-#     define PNG_USER_HEIGHT_MAX 1000000
+#     define PNG_USER_HEIGHT_MAX 1000000L
 #  endif
 #  ifndef PNG_USER_CHUNK_CACHE_MAX
 #     define PNG_USER_CHUNK_CACHE_MAX 128
 #  endif
 #  ifndef PNG_USER_CHUNK_MALLOC_MAX
-#     define PNG_USER_CHUNK_MALLOC_MAX 8000000
+#     define PNG_USER_CHUNK_MALLOC_MAX 8000000L
 #  endif
 #else
    /* values for no limits */
 #  ifndef PNG_USER_WIDTH_MAX
-#     define PNG_USER_WIDTH_MAX 0x7fffffff
+#     define PNG_USER_WIDTH_MAX 0x7fffffffL
 #  endif
 #  ifndef PNG_USER_HEIGHT_MAX
-#     define PNG_USER_HEIGHT_MAX 0x7fffffff
+#     define PNG_USER_HEIGHT_MAX 0x7fffffffL
 #  endif
 #  ifndef PNG_USER_CHUNK_CACHE_MAX
 #     define PNG_USER_CHUNK_CACHE_MAX 0