diff --git a/configure.ac b/configure.ac
index 5d563d5bd8..89952c3f5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1411,6 +1411,9 @@ requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >=
 EFL_DEPEND_PKG([evas], [FREETYPE], [freetype2 >= 9.3.0])
 
 ## optional dependencies
+# Valgrind
+EFL_OPTIONAL_DEPEND_PKG([evas], [${want_valgrind}],
+   [VALGRIND], [valgrind >= 2.4.0])
 
 # FontConfig
 EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fontconfig}],
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 985e91c41d..8774ae1203 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -214,7 +214,6 @@ lib_evas_libevas_la_CPPFLAGS = \
 @EFL_CFLAGS@ \
 @EFL_COV_CFLAGS@ \
 @EVAS_CFLAGS@ \
-@VALGRIND_CFLAGS@ \
 @ALTIVEC_CFLAGS@
 
 # SSE3