diff --git a/BlueBerry/BlueBerryConfig.cmake.in b/BlueBerry/BlueBerryConfig.cmake.in
index 7b65202630..b803e348eb 100644
--- a/BlueBerry/BlueBerryConfig.cmake.in
+++ b/BlueBerry/BlueBerryConfig.cmake.in
@@ -1,33 +1,35 @@
 
 SET(BLUEBERRY_PLUGINS_SOURCE_DIR "@BLUEBERRY_PLUGINS_SOURCE_DIR@")
 SET(BLUEBERRY_PLUGINS_BINARY_DIR "@BLUEBERRY_PLUGINS_BINARY_DIR@")
 
 SET(BLUEBERRY_PLUGIN_SOURCE_DIRS "@BLUEBERRY_PLUGINS_SOURCE_DIR@")
 SET(BLUEBERRY_PLUGINS_OUTPUT_DIR "@BLUEBERRY_PLUGINS_OUTPUT_DIR@")
 
 SET(BLUEBERRY_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@")
 SET(BlueBerry_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@")
 SET(BLUEBERRY_BINARY_DIR "@BLUEBERRY_BINARY_DIR@")
 
 SET(BLUEBERRY_DEBUG_POSTFIX @BLUEBERRY_DEBUG_POSTFIX@)
 
 SET(BLUEBERRY_USE_QT_HELP @BLUEBERRY_USE_QT_HELP@)
 SET(QT_HELPGENERATOR_EXECUTABLE "@QT_HELPGENERATOR_EXECUTABLE@")
 SET(QT_COLLECTIONGENERATOR_EXECUTABLE "@QT_COLLECTIONGENERATOR_EXECUTABLE@")
 SET(QT_ASSISTANT_EXECUTABLE "@QT_ASSISTANT_EXECUTABLE@")
 
+SET(BLUEBERRY_DOXYGEN_TAGFILE_NAME @BLUEBERRY_DOXYGEN_TAGFILE_NAME@)
+
 INCLUDE("@BLUEBERRY_BINARY_DIR@/BlueBerryBundleList.cmake")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@BLUEBERRY_SOURCE_DIR@/CMake")
 FIND_PACKAGE(Poco REQUIRED)
 
 INCLUDE(MacroParseArguments)
 INCLUDE(MacroConvertSchema)
 INCLUDE(MacroOrganizeSources)
 INCLUDE(berryPluginHelpers)
 INCLUDE(MacroCollectPlugins)
 INCLUDE(MacroParseManifest)
 INCLUDE(MacroCreatePlugin)
 INCLUDE(MacroCreateQtHelp)
 INCLUDE(MacroInstallPlugin)
-INCLUDE(MacroInstallThirdPartyPlugins)
\ No newline at end of file
+INCLUDE(MacroInstallThirdPartyPlugins)
diff --git a/BlueBerry/Documentation/CMakeLists.txt b/BlueBerry/Documentation/CMakeLists.txt
index 1f5f6ad6d8..27a038fe80 100755
--- a/BlueBerry/Documentation/CMakeLists.txt
+++ b/BlueBerry/Documentation/CMakeLists.txt
@@ -1,72 +1,74 @@
 # 
 # Variables:
 #  BLUEBERRY_DOCS_OUTPUT_DIR: documentation output directory (optional)
 
 FIND_PACKAGE(Doxygen)
 
 IF(DOXYGEN_FOUND)
 
 OPTION(USE_DOT "Use dot program for generating graphical class diagrams with doxygen, if available" ON)
 MARK_AS_ADVANCED(USE_DOT)
 
 SET(HAVE_DOT "NO")
 IF(DOXYGEN_DOT_EXECUTABLE AND USE_DOT)
   SET(HAVE_DOT "YES")
 ENDIF()
 
 SET(BLUEBERRY_DOCS_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "BlueBerry output directory for all generated documentation.")
 SET(BLUEBERRY_DOXYGEN_OUTPUT_DIR ${BLUEBERRY_DOCS_OUTPUT_DIR}/reference/api CACHE INTERNAL "BlueBerry doxygen output directory")
 SET(BLUEBERRY_XPDOC_OUTPUT_DIR ${BLUEBERRY_DOCS_OUTPUT_DIR}/reference/extension-points)
 
+SET(BLUEBERRY_DOXYGEN_TAGFILE_NAME ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/BlueBerry.tag CACHE INTERNAL "BlueBerry Doxygen tag file")
+
 FILE(RELATIVE_PATH BLUEBERRY_DOXYGEN_XP_RELATIVEDIR ${BLUEBERRY_DOXYGEN_OUTPUT_DIR}/html ${BLUEBERRY_XPDOC_OUTPUT_DIR}/)
 
 SET(_doxygen_qt4bundles )
 SET(_doxygen_bundles )
 SET(_doxygen_binary_qt4bundles )
 SET(_doxygen_binary_bundles )
 FILE(GLOB _bundle_dirs RELATIVE "${BLUEBERRY_PLUGINS_SOURCE_DIR}" "${BLUEBERRY_PLUGINS_SOURCE_DIR}/*")
 FOREACH(_bundle_dir ${_bundle_dirs})
   STRING(REGEX MATCH "^\\..*" _matched_hidden "${_bundle_dir}")
   IF(NOT _matched_hidden)
     IF(IS_DIRECTORY "${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}")
       STRING(REGEX MATCH ".*\\.qt.*" _matched "${_bundle_dir}")
       IF(_matched)
         IF(QT4_FOUND)
           SET(_doxygen_qt4bundles "${_doxygen_qt4bundles} \"${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}\"")
           SET(_doxygen_binary_qt4bundles  "${_doxygen_binary_qt4bundles} \"${BLUEBERRY_PLUGINS_BINARY_DIR}/${_bundle_dir}\"")
         ENDIF()
       ELSE()
         SET(_doxygen_bundles "${_doxygen_bundles} \"${BLUEBERRY_PLUGINS_SOURCE_DIR}/${_bundle_dir}\"")
         SET(_doxygen_binary_bundles  "${_doxygen_binary_bundles} \"${BLUEBERRY_PLUGINS_BINARY_DIR}/${_bundle_dir}\"")
       ENDIF()
     ENDIF()
   ENDIF()
 ENDFOREACH()
 
 CONFIGURE_FILE(doxygen.conf.in
                ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf)
                
 CONFIGURE_FILE(reference/extension-points/index.dox.in
                ${CMAKE_CURRENT_BINARY_DIR}/reference/extension-points/index.dox)
 
 FIND_PACKAGE(Doxygen)
 
 ADD_CUSTOM_TARGET(BlueBerryDoc 
                   ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf
                   DEPENDS ${_BlueBerryDoc_depends}
                   )
                   
 # convert the extension points schema files into html
 IF(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR)
   FILE(GLOB_RECURSE _plugin_xmls  ${BLUEBERRY_PLUGINS_SOURCE_DIR}/plugin.xml)
   MACRO_CONVERT_SCHEMA(INPUT ${_plugin_xmls} 
                        OUTPUT_DIR "${BLUEBERRY_XPDOC_OUTPUT_DIR}"
                        TARGET_NAME BlueBerryXPDoc
                        )
 
   ADD_DEPENDENCIES(BlueBerryDoc BlueBerryXPDoc)
 ENDIF(ANT_FOUND AND BLUEBERRY_DOC_TOOLS_DIR)
 
 CONFIGURE_FILE(schema.css ${BLUEBERRY_DOCS_OUTPUT_DIR}/schema.css)
 
 ENDIF(DOXYGEN_FOUND)