diff --git a/arpack-ng-config-version.cmake.in b/arpack-ng-config-version.cmake.in
index 1d3a8f0..f6e945c 100644
--- a/arpack-ng-config-version.cmake.in
+++ b/arpack-ng-config-version.cmake.in
@@ -1,5 +1,5 @@
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
-set(PACKAGE_VERSION "@arpack_ng_VERSION@")
+set(PACKAGE_VERSION "@PACKAGE_VERSION@")
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/arpack-ng-config.cmake.in b/arpack-ng-config.cmake.in
index 4ed944e..594d88a 100644
--- a/arpack-ng-config.cmake.in
+++ b/arpack-ng-config.cmake.in
@@ -13,16 +13,23 @@
 #   target_link_libraries(main PARPACK::PARPACK)
 
 # Create local variables.
-set(arpack_ng_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@/arpack;${MPI_Fortran_INCLUDE_DIRS};${MPI_C_INCLUDE_DIRS};${MPI_CXX_INCLUDE_DIRS}")
-if(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.a")
-  set(arpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.a")
-elseif(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.so")
-  set(arpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.so")
+set(prefix "@prefix@")
+set(exec_prefix "@exec_prefix@")
+set(libdir "@libdir@")
+set(includedir "@includedir@")
+
+set(arpack_ng_INCLUDE_DIRS "${includedir}/arpack;${MPI_Fortran_INCLUDE_DIRS};${MPI_C_INCLUDE_DIRS};${MPI_CXX_INCLUDE_DIRS}")
+
+if(EXISTS "${libdir}/libarpack.a")
+  set(arpack_ng_LIBRARIES "${libdir}/libarpack.a")
+elseif(EXISTS "${libdir}/libarpack.so")
+  set(arpack_ng_LIBRARIES "${libdir}/libarpack.so")
 endif()
-if(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libparpack.a")
-  set(parpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libparpack.a;${arpack_ng_LIBRARIES};${MPI_Fortran_LIBRARIES};${MPI_C_LIBRARIES};${MPI_CXX_LIBRARIES}")
-elseif(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libparpack.so")
-  set(parpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libparpack.so;${arpack_ng_LIBRARIES};${MPI_Fortran_LIBRARIES};${MPI_C_LIBRARIES};${MPI_CXX_LIBRARIES}")
+
+if(EXISTS "${libdir}/libparpack.a")
+  set(parpack_ng_LIBRARIES "${libdir}/libparpack.a;${arpack_ng_LIBRARIES};${MPI_Fortran_LIBRARIES};${MPI_C_LIBRARIES};${MPI_CXX_LIBRARIES}")
+elseif(EXISTS "${libdir}/libparpack.so")
+  set(parpack_ng_LIBRARIES "${libdir}/libparpack.so;${arpack_ng_LIBRARIES};${MPI_Fortran_LIBRARIES};${MPI_C_LIBRARIES};${MPI_CXX_LIBRARIES}")
 endif()
 
 # Create arpack targets.
diff --git a/configure.ac b/configure.ac
index 1fbab4c..4486eaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -257,16 +257,11 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], [${libdir
 AC_SUBST([ARPACK_PC_LIBS_PRIVATE], ["$LAPACK_LIBS $BLAS_LIBS"])
 AC_CONFIG_FILES([SRC/arpack$LIBSUFFIX.pc:SRC/arpack.pc.in], [], [LIBSUFFIX="$LIBSUFFIX"])
 
-AC_SUBST([CMAKE_INSTALL_FULL_LIBDIR], ["$libdir"])  # FIXME: need to recursively expand these
-AC_SUBST([CMAKE_INSTALL_FULL_INCLUDEDIR], ["$includedir"])
-AC_CONFIG_FILES([arpack-ng-config.cmake])
-
-AC_SUBST([arpack_ng_VERSION], ["$VERSION"])
-AC_CONFIG_FILES([arpack-ng-config-version.cmake])
-
 AC_CONFIG_FILES([
 	arpackdef.h
 	arpackicb.h
+	arpack-ng-config-version.cmake
+	arpack-ng-config.cmake
 	Makefile
 	ICB/Makefile
 	UTIL/Makefile