diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16cc51854db4cc91d8714e7a50e1a7ff63e5badf..63740f71f740cd8e711d12ecc39b9fdcf962edc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,13 @@ target_include_directories(${PROJECT_NAME}
   $<INSTALL_INTERFACE:include>
   )
 
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+OPTION(SUFFIX_SO_VERSION
+  "Suffix shared library name by a string depending on git status of project"
+  ON)
+
+IF (${SUFFIX_SO_VERSION} EQUAL "ON")
+  SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+ENDIF ()
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${CMAKE_DL_LIBS} pthread)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6561cf4202e330f2d319e1b390e482bb48d6076d..7924f1d6227fbc05d210ae3be451c862c0a4f82d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,6 +2,7 @@
 #
 
 ADD_DEFINITIONS(-DDEBUG=2)
+SET(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags)
 
 # Add Boost path to include directories.
 #INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})