diff --git a/config.mk.in b/config.mk.in
index 7c9ae64..3f917f3 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -33,7 +33,7 @@ GLASGOW_HASKELL = @GLASGOW_HASKELL@
 GHC_EXTRA_OPTS  = @SYMS@ @DEBUG_OPTS@
 GHC_LD_OPTS     =
 
-GHC_PKG         = @GHCPKG@-@GHC_VERSION@
+GHC_PKG         = @GHCPKG@
 
 LD              = @LD@
 LD_X            = @LD@ -x
diff --git a/configure.ac b/configure.ac
index d332cd3..08b3f62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,13 +133,17 @@ AC_ARG_WITH(ghc-pkg,
        AC_MSG_ERROR([$GHCPKG not found. You need ghc-pkg])
     fi
   ],
-  [ AC_CHECK_PROG(GHCPKG,ghc-pkg,ghc-pkg)
-    if test -z "$GHCPKG" ; then
-       AC_MSG_ERROR([You need ghc-pkg])
-    fi 
+  [ AC_MSG_CHECKING([for ghc-pkg])
+    if ghc-pkg-$GHC_VERSION -V > /dev/null ; then
+        GHCPKG=ghc-pkg-$GHC_VERSION
+    elif test ghc-pkg -V > /dev/null ; then
+        GHCPKG=ghc-pkg
+    else
+        AC_MSG_ERROR(You need ghc-pkg)
+    fi
+    AC_MSG_RESULT([$GHCPKG])
   ]
   )
-
 AC_SUBST(GHCPKG)
 
 AC_CHECK_PROG(HADDOCK,haddock,haddock)