diff --git a/CMakeLists.txt b/CMakeLists.txt
index cff01918..67c3459e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ ENABLE_TESTING()
 set(LIB_VERSION_MAJOR "1")
 set(LIB_VERSION_MINOR "1")
 set(LIB_VERSION_PATCH "0")
+set(LIB_VERSION "${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/third_party/cmake/modules/")
 
@@ -133,21 +134,21 @@ if(BUILD_PYTHON_BINDINGS)
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/pyiec61850)
 endif(BUILD_PYTHON_BINDINGS)
 
+set(CPACK_PACKAGE_DESCRIPTION "IEC 61850 MMS/GOOSE client and server library")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IEC 61850 MMS/GOOSE client and server library")
+set(CPACK_PACKAGE_VENDOR "MZ Automation GmbH")
+set(CPACK_PACKAGE_CONTACT "info@libiec61850.com")
+set(CPACK_PACKAGE_VERSION_MAJOR "${LIB_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${LIB_VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${LIB_VERSION_PATCH}")
+set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+set(CPACK_COMPONENTS_ALL Libraries Development Applications)
+#set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
+
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
     include(InstallRequiredSystemLibraries)
-    
-    set(CPACK_PACKAGE_DESCRIPTION "IEC 61850 MMS/GOOSE client and server library")
-    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IEC 61850 MMS/GOOSE client and server library")
-    set(CPACK_PACKAGE_VENDOR "MZ Automation GmbH")
-    set(CPACK_PACKAGE_CONTACT "info@libiec61850.com")
-    set(CPACK_PACKAGE_VERSION_MAJOR "${LIB_VERSION_MAJOR}")
-    set(CPACK_PACKAGE_VERSION_MINOR "${LIB_VERSION_MINOR}")
-    set(CPACK_PACKAGE_VERSION_PATCH "${LIB_VERSION_PATCH}")
-    set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${CMAKE_SYSTEM_PROCESSOR}")
-    set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-    
-    set(CPACK_COMPONENTS_ALL Libraries Development Applications)
-    #set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
 
     include(CPack)
 endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49938c32..36dc6183 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -367,6 +367,11 @@ if(MSVC)
 endif()
 ENDIF(WITH_WPCAP)
 
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+  configure_file(Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+  add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Generating API documentation with Doxygen" VERBATIM)
+endif(DOXYGEN_FOUND)
 
 install (TARGETS iec61850 iec61850-shared
 	RUNTIME DESTINATION bin COMPONENT Applications
diff --git a/src/doxygen.config b/src/Doxyfile.in
similarity index 99%
rename from src/doxygen.config
rename to src/Doxyfile.in
index b8d9b434..42bc4fd0 100644
--- a/src/doxygen.config
+++ b/src/Doxyfile.in
@@ -16,11 +16,11 @@
 
 DOXYFILE_ENCODING      = UTF-8
 
-PROJECT_NAME           = "libIEC61850"
+PROJECT_NAME           = "@PROJECT_NAME@"
 
-PROJECT_NUMBER         = 1.1
+PROJECT_NUMBER         = @LIB_VERSION@
 
-PROJECT_BRIEF          = "Open-source IEC 61850 MMS/GOOSE/SV server and client library"
+PROJECT_BRIEF          = "@CPACK_PACKAGE_DESCRIPTION_SUMMARY@"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
@@ -34,7 +34,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ../doxydoc
+OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/../doxydoc
 
 CREATE_SUBDIRS         = NO