diff --git a/apr-config.in b/apr-config.in
index bed47cacb..2cba29b1d 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -39,7 +39,7 @@ LDFLAGS="@EXTRA_LDFLAGS@"
 LIBS="@EXTRA_LIBS@"
 EXTRA_INCLUDES="@EXTRA_INCLUDES@"
 SHLIBPATH_VAR="@shlibpath_var@"
-APR_SOURCE_DIR="@apr_srcdir@"
+APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
 APR_BUILD_DIR="@apr_builddir@"
 APR_SO_EXT="@so_ext@"
 APR_LIB_TARGET="@export_lib_target@"
@@ -243,13 +243,7 @@ while test $# -gt 0; do
     exit 0
     ;;
     --apr-libtool)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}/libtool"
-    elif test "$location" = "crosscompile"; then
-        echo "$APR_TARGET_DIR/${installbuilddir}/libtool"
-    else
-        echo "$APR_BUILD_DIR/libtool"
-    fi
+        echo "$installbuilddir/libtool"
     exit 0
     ;;
     --help)