diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dde2cc..78e015b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,10 @@ set (
 
 ######## Windows
 
-if (WIN32)
-	set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
-	set(CMAKE_STATIC_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
-endif (WIN32)
+#if (WIN32)
+#	set(CMAKE_SHARED_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
+#	set(CMAKE_STATIC_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX})
+#endif (WIN32)
 
 ######## Directory
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0b26a3b..0b36fd0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,6 +85,15 @@ install(
 	LIBRARY DESTINATION
 		${DIR_LIBRARY}
 )
+else (NOT WIN32)
+install(
+	TARGETS
+		${UCHARDET_TARGET}
+        RUNTIME DESTINATION
+                ${DIR_BIN}
+	ARCHIVE DESTINATION
+		${DIR_LIBRARY}
+)
 endif (NOT WIN32)
 
 install(
diff --git a/src/symbols.cmake b/src/symbols.cmake
index 2aa4601..9453baf 100644
--- a/src/symbols.cmake
+++ b/src/symbols.cmake
@@ -19,7 +19,7 @@ if (APPLE)
 	set(LINK_FLAGS
 		"${LINK_FLAGS} -Wl,-exported_symbols_list,'${_symbols_list}'")
 
-elseif (CMAKE_C_COMPILER_ID STREQUAL GNU)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
 	# Create a version script for GNU ld.
 	set(_symbols "{ global: ${UCHARDET_SYMBOLS}; local: *; };")
 	set(_version_script "${CMAKE_CURRENT_BINARY_DIR}/version.script")
@@ -30,8 +30,7 @@ elseif (CMAKE_C_COMPILER_ID STREQUAL GNU)
 endif (APPLE)
 
 set_target_properties(
-	${LIBUCHARDET_TARGET}
-	${LIBUCHARDET_STATIC_TARGET}
+	${UCHARDET_TARGET}
 	PROPERTIES
 		LINK_FLAGS
 			"${LINK_FLAGS}"