diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16700072069f015dc744063a724a6900e2073d3f..d7cb5928389ab33bc34e39d2428d1a68a5f5d4aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,8 +44,8 @@ message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Protobuf REQUIRED)
 
-set(IRCClientQt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
-find_package(IRCClientQt)
+set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
+find_package(Communi)
 
 set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(log4cxx)
@@ -64,6 +64,25 @@ ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
 
 message("  Supported features")
 message("-----------------------")
+
+if (SPECTRUM_VERSION)
+	ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
+else (SPECTRUM_VERSION)
+	if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
+		execute_process(COMMAND git "--git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git" rev-parse --short HEAD
+						OUTPUT_VARIABLE GIT_REVISION
+						OUTPUT_STRIP_TRAILING_WHITESPACE
+		)
+		set(SPECTRUM_VERSION 2.0.0-beta-git-${GIT_REVISION})
+		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
+	else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
+		set(SPECTRUM_VERSION 2.0.0-alpha)
+		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
+	endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
+endif (SPECTRUM_VERSION)
+
+message("Version           : " ${SPECTRUM_VERSION})
+
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
 	include_directories(${SQLITE3_INCLUDE_DIR})
@@ -104,13 +123,13 @@ if (PROTOBUF_FOUND)
 	endif()
 
 	if(IRC_FOUND)
-		ADD_DEFINITIONS(-DIRC_SHARED)
+		ADD_DEFINITIONS(-DCOMMUNI_SHARED)
 		message("IRC plugin        : yes")
 		include_directories(${QT_QTNETWORK_INCLUDE_DIR})
 		include_directories(${IRC_INCLUDE_DIR})
 		include(${QT_USE_FILE})
 	else()
-		message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")
+		message("IRC plugin        : no (install libCommuni and libprotobuf-dev)")
 	endif()
 
 	message("Frotz plugin      : yes")
@@ -170,10 +189,8 @@ include_directories(${OPENSSL_INCLUDE_DIR})
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(plugin)
 ADD_SUBDIRECTORY(include)
-#ADD_SUBDIRECTORY(examples)
 ADD_SUBDIRECTORY(spectrum)
 ADD_SUBDIRECTORY(backends)
-#ADD_SUBDIRECTORY(tests)
 if (NOT WIN32)
 	ADD_SUBDIRECTORY(spectrum_manager)
 endif()