diff --git a/CMakeLists.txt b/CMakeLists.txt
index 868dd9fc..eb2661d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,10 +30,9 @@ SET( PACKAGE_COPYRIGHT      "Andreas Huggel" )
 SET( PACKAGE_BUGREPORT      "http://github.com/exiv2/exiv2" )
 SET( PACKAGE                "exiv2" )
 SET( PACKAGE_NAME           "exiv2" )
-SET( PACKAGE_STRING         "exiv2 0.26" )
-SET( PACKAGE_TARNAME        "exiv2" )
 SET( PACKAGE_VERSION        "0.26" )
 SET( PACKAGE_URL            "http://www.exiv2.org" )
+SET( PACKAGE_STRING         "${PACKAGE_NAME} ${PACKAGE_VERSION}" )
 SET( GENERIC_LIB_VERSION    "26.0.0" )
 SET( GENERIC_LIB_SOVERSION  "26" )
 
diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index 95e9a06f..1d7c90b6 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -190,12 +190,6 @@ SET( EXV_SYMBOLS ENABLE_WEBREADY
                  HAVE__BOOL
                  HAVE_REGEX
                  UNICODE_PATH
-                 PACKAGE
-                 PACKAGE_BUGREPORT
-                 PACKAGE_NAME
-                 PACKAGE_STRING
-                 PACKAGE_TARNAME
-                 PACKAGE_VERSION
                  STRERROR_R_CHAR_P
    )
 
diff --git a/config/config.h.cmake b/config/config.h.cmake
index 4f5ced57..bdb7969a 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -154,20 +154,14 @@
    slash. */
 #cmakedefine EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine EXV_PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
-
 /* Define to the name of this package. */
-#cmakedefine EXV_PACKAGE "@PACKAGE@"
+#cmakedefine EXV_PACKAGE "@EXV_PACKAGE@"
 
 /* Define to the full name of this package. */
-#cmakedefine EXV_PACKAGE_NAME "@PACKAGE_NAME@"
+#cmakedefine EXV_PACKAGE_NAME "@EXV_PACKAGE_NAME@"
 
 /* Define to the full name and version of this package. */
-#cmakedefine EXV_PACKAGE_STRING "@PACKAGE_STRING@"
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine EXV_PACKAGE_TARNAME "@PACKAGE_TARNAME@"
+#cmakedefine EXV_PACKAGE_STRING "@EXV_PACKAGE_STRING@"
 
 /* Define to the version of this package. */
 #cmakedefine EXV_PACKAGE_VERSION "@PACKAGE_VERSION@"
diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake
index 72610519..25fab6da 100644
--- a/config/generateConfigFile.cmake
+++ b/config/generateConfigFile.cmake
@@ -4,6 +4,10 @@ if (${EXIV2_ENABLE_WEBREADY})
     set(EXV_USE_CURL  ${EXIV2_ENABLE_CURL})
 endif()
 set(EXV_ENABLE_VIDEO     ${EXIV2_ENABLE_VIDEO})
+set(EXV_PACKAGE          ${PACKAGE})
+set(EXV_PACKAGE_VERSION  ${PACKAGE_VERSION})
+set(EXV_PACKAGE_STRING   ${PACKAGE_STRING})
+set(EXV_HAVE_XMP_TOOLKIT ${HAVE_XMP_TOOLKIT})
 
 # TODO: Try to use the cmake function check_symbol_exists which is more robust
 check_function_exists( gmtime_r EXV_HAVE_GMTIME_R )
diff --git a/include/exiv2/exv_msvc-webready.h b/include/exiv2/exv_msvc-webready.h
index ac4dd409..9b3d9719 100644
--- a/include/exiv2/exv_msvc-webready.h
+++ b/include/exiv2/exv_msvc-webready.h
@@ -18,18 +18,9 @@
 /* Define to 1 if you have the <process.h> header file. */
 #define EXV_HAVE_PROCESS_H 1
 
-/* Define to the address where bug reports for this package should be sent. */
-#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"
-
-/* Define to the full name of this package. */
-#define EXV_PACKAGE_NAME "exiv2"
-
 /* Define to the full name and version of this package. */
 #define EXV_PACKAGE_STRING "exiv2 0.26"
 
-/* Define to the one symbol short name of this package. */
-#define EXV_PACKAGE_TARNAME "exiv2"
-
 /* Define to the version of this package. */
 #define EXV_PACKAGE_VERSION "0.26"
 
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 82116277..d371ca97 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -158,21 +158,12 @@
    slash. */
 /* #undef EXV_LSTAT_FOLLOWS_SLASHED_SYMLINK */
 
-/* Define to the address where bug reports for this package should be sent. */
-#define EXV_PACKAGE_BUGREPORT "ahuggel@gmx.net"
-
 /* Define to the name of this package. */
 #define EXV_PACKAGE "exiv2"
 
-/* Define to the full name of this package. */
-#define EXV_PACKAGE_NAME "exiv2"
-
 /* Define to the full name and version of this package. */
 #define EXV_PACKAGE_STRING "exiv2 0.26"
 
-/* Define to the one symbol short name of this package. */
-#define EXV_PACKAGE_TARNAME "exiv2"
-
 /* Define to the version of this package. */
 #define EXV_PACKAGE_VERSION "0.26"