diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index e867ded2f2..95f02abde0 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -1887,8 +1887,6 @@ AC_SUBST(qt_moc)
 
 AC_SUBST(gif_cflags)
 AC_SUBST(gif_libs)
-AC_SUBST(png_cflags)
-AC_SUBST(png_libs)
 AC_SUBST(jpeg_cflags)
 AC_SUBST(jpeg_libs)
 AC_SUBST(tiff_cflags)
diff --git a/legacy/evas/src/modules/loaders/png/Makefile.am b/legacy/evas/src/modules/loaders/png/Makefile.am
index 3d937efb6e..3ddf6ab005 100644
--- a/legacy/evas/src/modules/loaders/png/Makefile.am
+++ b/legacy/evas/src/modules/loaders/png/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
-			 @FREETYPE_CFLAGS@ @png_cflags@
+			 @FREETYPE_CFLAGS@ @PNG_CFLAGS@
 
 pkgdir                 = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
 
@@ -12,7 +12,7 @@ pkg_LTLIBRARIES        = module.la
 
 module_la_SOURCES      = evas_image_load_png.c
 
-module_la_LIBADD       = @png_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD       = @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version
 
 module_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/legacy/evas/src/modules/savers/png/Makefile.am b/legacy/evas/src/modules/savers/png/Makefile.am
index 667f1ae6b8..8140ab6fb4 100644
--- a/legacy/evas/src/modules/savers/png/Makefile.am
+++ b/legacy/evas/src/modules/savers/png/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
-			 @FREETYPE_CFLAGS@ @png_cflags@
+			 @FREETYPE_CFLAGS@ @PNG_CFLAGS@
 
 pkgdir                 = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
 
@@ -12,7 +12,7 @@ pkg_LTLIBRARIES        = module.la
 
 module_la_SOURCES      = evas_image_save_png.c
 
-module_la_LIBADD       = @png_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD       = @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version
 
 module_la_DEPENDENCIES = $(top_builddir)/config.h