diff --git a/CMakeLists.txt b/CMakeLists.txt
index dee8b62942..1e65fe25dc 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,7 +294,7 @@ configure_package_config_file(
   
 write_basic_package_version_file(
     ${CMAKE_CURRENT_BINARY_DIR}/osgEarthConfigVersion.cmake
-    VERSION 3.4.0
+    VERSION ${OSGEARTH_VERSION}
     COMPATIBILITY SameMajorVersion)
   
 install(
diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in
index a7aec3ef90..2e79e9b47e 100644
--- a/osgEarthConfig.cmake.in
+++ b/osgEarthConfig.cmake.in
@@ -1,4 +1,4 @@
-set(OSGEARTH_VERSION 3.1.0)
+set(OSGEARTH_VERSION @OSGEARTH_VERSION@)
 
 @PACKAGE_INIT@
 
@@ -29,12 +29,12 @@ find_library(osgEarth_LIBRARY_DEBUG
     HINTS ${${XPREFIX}_LIBRARY_DIRS}
 )
 
-set(osgEarth_LIBRARIES    ${osgEarth_LIBRARY})
-set(osgEarth_LIBRARIES_DEBUG    ${osgEarth_LIBRARY_DEBUG})
+set(osgEarth_LIBRARIES ${osgEarth_LIBRARY})
+set(osgEarth_LIBRARIES_DEBUG ${osgEarth_LIBRARY_DEBUG})
 set(osgEarth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
-set(osgEarth_LIBRARY_DIR  ${osgEarth_LIBRARY_DIRS})
+set(osgEarth_LIBRARY_DIR ${osgEarth_LIBRARY_DIRS})
 set(osgEarth_INCLUDE_DIRS ${osgEarth_INCLUDE_DIR})
-set(osgEarth_LDFLAGS      ${${XPREFIX}_LDFLAGS})
+set(osgEarth_LDFLAGS ${${XPREFIX}_LDFLAGS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(osgEarth DEFAULT_MSG