diff --git a/configure.ac b/configure.ac
index 4673b99..1456fe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,15 +76,8 @@ AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
 
 # Use OpenCV?
 ac_cv_my_have_opencv="no"
-save_CPPFLAGS="${CPPFLAGS}"
-AC_PATH_PROG(OPENCV_CONFIG, opencv-config, no)
-if test "${OPENCV_CONFIG}" != "no"; then
-  CPPFLAGS="${CPPFLAGS} `opencv-config --cflags`"
-fi
-AC_CHECK_HEADERS(cv.h,
- [ac_cv_my_have_opencv="yes"],
- [ac_cv_my_have_opencv="no"])
-CPPFLAGS="${save_CPPFLAGS}"
+OPENCV="no"
+PKG_CHECK_MODULES(OPENCV, opencv, [ac_cv_my_have_opencv="yes"])
 if test "${ac_cv_my_have_opencv}" != "no"; then
   AC_DEFINE(USE_OPENCV, 1, Define to 1 to use OpenCV)
 fi
@@ -94,7 +87,6 @@ AM_CONDITIONAL(USE_OPENCV, test "${ac_cv_my_have_opencv}" = "yes")
 ac_cv_my_have_imlib2="no"
 IMLIB2="no"
 PKG_CHECK_MODULES(IMLIB2, imlib2, [ac_cv_my_have_imlib2="yes"])
-AC_MSG_RESULT($ac_cv_my_have_imlib2)
 if test "${ac_cv_my_have_imlib2}" != "no"; then
   AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
 fi
diff --git a/pipi/Makefile.am b/pipi/Makefile.am
index f49d330..3aa0775 100644
--- a/pipi/Makefile.am
+++ b/pipi/Makefile.am
@@ -46,8 +46,8 @@ codec_sources += codec/imlib.c
 endif
 
 if USE_OPENCV
-codec_cflags += `opencv-config --cflags`
-codec_libs += `opencv-config --libs opencv highgui`
+codec_cflags += @OPENCV_CFLAGS@
+codec_libs += @OPENCV_LIBS@
 codec_sources += codec/opencv.c
 endif