diff --git a/configure b/configure
index 8d24fc0..8367adf 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS IMLIB2_CONFIG_IN_PATH IMLIB2_CFLAGS IMLIB2_LIBS PKG_CONFIG ac_pt_PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS LIBGTOP_LIBS LIBGTOP_CFLAGS GTK2_CFLAGS GTK2_LIBS GKFORKPLOP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS IMLIB2_CFLAGS IMLIB2_LIBS PKG_CONFIG ac_pt_PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS LIBGTOP_LIBS LIBGTOP_CFLAGS GTK2_CFLAGS GTK2_LIBS GKFORKPLOP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -5334,49 +5334,8 @@ fi
 done
 
 
-# Extract the first word of "imlib2-config", so it can be a program name with args.
-set dummy imlib2-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_IMLIB2_CONFIG_IN_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$IMLIB2_CONFIG_IN_PATH"; then
-  ac_cv_prog_IMLIB2_CONFIG_IN_PATH="$IMLIB2_CONFIG_IN_PATH" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_IMLIB2_CONFIG_IN_PATH="yes"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_IMLIB2_CONFIG_IN_PATH" && ac_cv_prog_IMLIB2_CONFIG_IN_PATH="no"
-fi
-fi
-IMLIB2_CONFIG_IN_PATH=$ac_cv_prog_IMLIB2_CONFIG_IN_PATH
-if test -n "$IMLIB2_CONFIG_IN_PATH"; then
-  echo "$as_me:$LINENO: result: $IMLIB2_CONFIG_IN_PATH" >&5
-echo "${ECHO_T}$IMLIB2_CONFIG_IN_PATH" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test "x$IMLIB2_CONFIG_IN_PATH" = "xno"; then
-  { { echo "$as_me:$LINENO: error: imlib2-config not found in PATH.. You need to install Imlib2 (and its developpement package)" >&5
-echo "$as_me: error: imlib2-config not found in PATH.. You need to install Imlib2 (and its developpement package)" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-IMLIB2_CFLAGS=$(imlib2-config --cflags)
-IMLIB2_LIBS=$(imlib2-config --libs)
+IMLIB2_CFLAGS=$(pkg-config --cflags imlib2)
+IMLIB2_LIBS=$(pkg-config --libs imlib2)
 
 
 
diff --git a/configure.ac b/configure.ac
index dac5b0f..a94aa01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,22 +38,18 @@ CFLAGS="$CFLAGS $X_CFLAGS"
 dnl Checks for library functions.
 AC_CHECK_HEADERS(linux/hdreg.h)
 
-AC_CHECK_PROG([IMLIB2_CONFIG_IN_PATH],[imlib2-config],[yes],[no])
-if test "x$IMLIB2_CONFIG_IN_PATH" = "xno"; then
-  AC_ERROR([imlib2-config not found in PATH.. You need to install Imlib2 (and its developpement package)])
-fi
-IMLIB2_CFLAGS=$(imlib2-config --cflags)
-IMLIB2_LIBS=$(imlib2-config --libs)
+IMLIB2_CFLAGS=$(pkg-config --cflags imlib2)
+IMLIB2_LIBS=$(pkg-config --libs imlib2)
 AC_SUBST(IMLIB2_CFLAGS)
 AC_SUBST(IMLIB2_LIBS)
 
 YELLOW="\\033\\1331;33m"
 RESET="\\033\\1330m"
 
-PKG_CHECK_MODULES(PACKAGE, [libgtop-2.0 >= 2.7.90], LIBGTOPBUG="no", LIBGTOPBUG="yes")
-PKG_CHECK_MODULES(PACKAGE, [libgtop-2.0 >= 2.0.0])
-LIBGTOP_CFLAGS=$PACKAGE_CFLAGS;
-LIBGTOP_LIBS=$PACKAGE_LIBS;
+PKG_CHECK_MODULES(libgtop, [libgtop-2.0 >= 2.7.90], LIBGTOPBUG="no", LIBGTOPBUG="yes")
+PKG_CHECK_MODULES(libgtop, [libgtop-2.0 >= 2.0.0])
+LIBGTOP_CFLAGS=$libgtop_CFLAGS;
+LIBGTOP_LIBS=$libgtop_LIBS;
 dnl LIBGTOP_LIBS=`pkg-config --libs libgtop-2.0`
 dnl LIBGTOP_CFLAGS=`pkg-config --cflags libgtop-2.0`
 AC_SUBST(LIBGTOP_LIBS)
@@ -87,9 +83,9 @@ if test "x$build_gkforkplop" = "xno"; then
 else
   echo building with GKFORKPLOP, checking for gtk2..
   pkg_modules="gtk+-2.0 >= 2.0.0"
-  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-  GTK2_CFLAGS=$PACKAGE_CFLAGS;
-  GTK2_LIBS=$PACKAGE_LIBS;
+  PKG_CHECK_MODULES(gtk2, [$pkg_modules])
+  GTK2_CFLAGS=$gtk2_CFLAGS;
+  GTK2_LIBS=$gtk2_LIBS;
   AC_SUBST(GTK2_CFLAGS)
   AC_SUBST(GTK2_LIBS)
   SAVECPPFLAGS="$CPPFLAGS"