diff --git a/ANNOUNCE b/ANNOUNCE
index bc17fdf..17e4a0c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -664,6 +664,10 @@
   Revised Makefile.in
 
 version 1.4.0beta98 [November 13, 2009]
+  Moved libpng-config.in and libpng.pc-configure.in out of the scripts
+    directory, to libpng-config.in and libpng-pc.in, respectively, and
+    modified Makefile.am and configure.ac accordingly.  Now "configure"
+    needs nothing from the "scripts" directory.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index ca06192..7492d2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2350,6 +2350,11 @@
   Revised Makefile.in
 
 version 1.4.0beta98 [November 13, 2009]
+  Moved libpng-config.in and libpng.pc-configure.in out of the scripts
+    directory, to libpng-config.in and libpng-pc.in, respectively, and
+    modified Makefile.am and configure.ac accordingly.  Now "configure"
+    needs nothing from the "scripts" directory.
+  Avoid redefining PNG_CONST in pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index fd1a035..d5030e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,6 @@
 	${srcdir}/projects/visualc6/* \
 	${srcdir}/projects/visualc71/* \
 	${srcdir}/projects/xcode/* \
-	${srcdir}/scripts/* \
 	${srcdir}/contrib/gregbook/* \
 	${srcdir}/contrib/pngminim/* \
 	${srcdir}/contrib/pngminus/* \
diff --git a/Makefile.in b/Makefile.in
index 853d668..72d122f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,10 +53,9 @@
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure $(top_srcdir)/scripts/libpng-config.in \
-	$(top_srcdir)/scripts/libpng.pc-configure.in INSTALL TODO \
-	config.guess config.sub depcomp install-sh ltmain.sh missing \
-	mkinstalldirs
+	$(srcdir)/libpng-config.in $(srcdir)/libpng-pc.in \
+	$(top_srcdir)/configure INSTALL TODO config.guess config.sub \
+	depcomp install-sh ltmain.sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -323,7 +322,6 @@
 	${srcdir}/projects/visualc6/* \
 	${srcdir}/projects/visualc71/* \
 	${srcdir}/projects/xcode/* \
-	${srcdir}/scripts/* \
 	${srcdir}/contrib/gregbook/* \
 	${srcdir}/contrib/pngminim/* \
 	${srcdir}/contrib/pngminus/* \
@@ -394,9 +392,9 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-libpng.pc: $(top_builddir)/config.status $(top_srcdir)/scripts/libpng.pc-configure.in
+libpng.pc: $(top_builddir)/config.status $(srcdir)/libpng-pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-libpng-config: $(top_builddir)/config.status $(top_srcdir)/scripts/libpng-config.in
+libpng-config: $(top_builddir)/config.status $(srcdir)/libpng-config.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
diff --git a/configure b/configure
index a3657be..d3ca93e 100755
--- a/configure
+++ b/configure
@@ -11488,9 +11488,9 @@
 
 
 # Config files, substituting as above
-ac_config_files="$ac_config_files Makefile libpng.pc:scripts/libpng.pc-configure.in"
+ac_config_files="$ac_config_files Makefile libpng.pc:libpng-pc.in"
 
-ac_config_files="$ac_config_files libpng-config:scripts/libpng-config.in"
+ac_config_files="$ac_config_files libpng-config:libpng-config.in"
 
 
 cat >confcache <<\_ACEOF
@@ -12467,8 +12467,8 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:scripts/libpng.pc-configure.in" ;;
-    "libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:scripts/libpng-config.in" ;;
+    "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng-pc.in" ;;
+    "libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:libpng-config.in" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index f947187..30fbea0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,8 +117,8 @@
 AC_SUBST([binconfigs])
 
 # Config files, substituting as above
-AC_CONFIG_FILES([Makefile libpng.pc:scripts/libpng.pc-configure.in])
-AC_CONFIG_FILES([libpng-config:scripts/libpng-config.in],
+AC_CONFIG_FILES([Makefile libpng.pc:libpng-pc.in])
+AC_CONFIG_FILES([libpng-config:libpng-config.in],
 		[chmod +x libpng-config])
 
 AC_OUTPUT
diff --git a/pngconf.h b/pngconf.h
index f96d588..e8cdee8 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -419,10 +419,12 @@
  * If you do not want to use const, define PNG_NO_CONST here.
  */
 
-#ifndef PNG_NO_CONST
-#  define PNG_CONST const
-#else
-#  define PNG_CONST
+#ifndef PNG_CONST
+#  ifndef PNG_NO_CONST
+#    define PNG_CONST const
+#  else
+#    define PNG_CONST
+#  endif
 #endif
 
 /* The following defines give you the ability to remove code from the