diff --git a/configure.ac b/configure.ac
index eabffe5..5baf228 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,7 @@ esac
 AC_MSG_CHECKING(
   [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
 AC_TRY_COMPILE(
-  [#define PNG_CONFIGURE_LIBPNG
-   #include "$srcdir/pnggccrd.c"],
+  [#include "$srcdir/pnggccrd.c"],
   [return 0;],
   AC_MSG_RESULT(yes)
   LIBPNG_NO_MMX="",
diff --git a/pngconf.h b/pngconf.h
index 8304989..20a338c 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -38,25 +38,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#else
-/* pngconf.h is part of the exported API. When a libpng-using application
-   includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
-   libpng's config.h available in this case. This means that we do not have the
-   defines added to config.h and the commandline by libpng's ./configure .
-   
-   For all defines from config.h not having them set is not a problem, however
-   ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
-   on a platform on which the MMX and SSE asm code in libpng is not supported.
-   
-   We do need this define as this define is used to determine whether or not
-   to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
-   and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
-   (ImageMagick for example) to determine whether or not they can use the asm
-   functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
-   on which the MMX and SSE asm code in libpng is not supported: */
-#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
-#define PNG_NO_ASSEMBLER_CODE
-#endif
 #endif
 
 /*
diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in
index 14152cc..7ae7d50 100755
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -11,11 +11,11 @@
 
 # Modeled after libxml-config.
 
-version=`pkg-config --modversion libpng12`
-prefix=`pkg-config --variable prefix libpng12`
-exec_prefix=`pkg-config --variable exec_prefix libpng12`
-libdir=`pkg-config --variable libdir libpng12`
-includedir=`pkg-config --variable includedir libpng12`
+version="@PNGLIB_VERSION@"
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
 libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
 all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"
diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in
index 782feb1..cadb555 100644
--- a/scripts/libpng.pc-configure.in
+++ b/scripts/libpng.pc-configure.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 
-Name: libpng12
+Name: libpng
 Description: Loads and saves PNG files
 Version: @PNGLIB_VERSION@
 Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@