diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index f55917bfe35b0a858f226a05acbe57825745f428..7b04a129a26173bac55a8da838c2bfc6d0c3307d 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -88,14 +88,19 @@ endif()
 
 # -----------------------------------------------
 # installation
-# FIXME installation goes in two place (lib, bin), this is temporary
 # -----------------------------------------------
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION Examples COMPONENT Examples FILES_MATCHING PATTERN "*.py" )
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/Examples/ DESTINATION Examples COMPONENT Examples FILES_MATCHING PATTERN "README")
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/bin/ DESTINATION bin COMPONENT Libraries)
-#install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
-install (TARGETS ${library_name} DESTINATION bin COMPONENT Libraries)
 
+if(WIN32)
+    set(libdir "bin")
+else()
+    set(libdir "lib")
+endif()
+install (TARGETS ${library_name} DESTINATION ${libdir} COMPONENT Libraries)
+
+# windows requires to rename *.dll into *.pyd to use them from python
 if(WIN32 AND BORNAGAIN_PYTHON)
     install(FILES 
     ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd
diff --git a/Fit/CMakeLists.txt b/Fit/CMakeLists.txt
index 7d3f50c693de9144b0b6c5d52d733439594d4a60..aa389292b1221ee66d3bd586608c0876ae6ddd5c 100644
--- a/Fit/CMakeLists.txt
+++ b/Fit/CMakeLists.txt
@@ -74,11 +74,15 @@ endif()
 
 # -----------------------------------------------
 # installation
-# FIXME installation goes in two place (lib, bin), this is temporary
 # -----------------------------------------------
-#install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
-install (TARGETS ${library_name} DESTINATION bin COMPONENT Libraries)
+if(WIN32)
+    set(libdir "bin")
+else()
+    set(libdir "lib")
+endif()
+install (TARGETS ${library_name} DESTINATION ${libdir} COMPONENT Libraries)
 
+# windows requires to rename *.dll into *.pyd to use them from python
 if(WIN32 AND BORNAGAIN_PYTHON)
     install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION lib COMPONENT Libraries)
     install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION bin COMPONENT Libraries)
diff --git a/README b/README
index e132126f8462e0b139d6fad84c89687f8cc0dee0..0bc01a6a25f37e22c22e5ed429bdcda2aea8846a 100644
--- a/README
+++ b/README
@@ -8,3 +8,4 @@ changelog    :  see Doc/CHANGELOG
 
 
 
+
diff --git a/ThirdParty/RootMinimizers/CMakeLists.txt b/ThirdParty/RootMinimizers/CMakeLists.txt
index b4271bc55d1c0a4612cd675ae3c190464550e7cf..0bc6ca215e9cedd72d1c561ee351e5bf3c5d2a2c 100644
--- a/ThirdParty/RootMinimizers/CMakeLists.txt
+++ b/ThirdParty/RootMinimizers/CMakeLists.txt
@@ -42,4 +42,4 @@ include_directories(${GSL_INCLUDE_DIRS})
 target_link_libraries(${library_name} ${GSL_LIBRARIES})
 
 # --- installation ---
-install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)
+#install (TARGETS ${library_name} DESTINATION lib COMPONENT Libraries)