--- CMakeLists.txt.orig	2016-04-08 15:53:55.837471917 +0200
+++ CMakeLists.txt	2016-04-08 15:56:02.489477066 +0200
@@ -503,11 +503,11 @@
     SOVERSION ${ORTHANC_VERSION}
     )
 
-  install(
-    TARGETS ServeFolders
-    RUNTIME DESTINATION lib    # Destination for Windows
-    LIBRARY DESTINATION share/orthanc/plugins    # Destination for Linux
-    )
+  if (${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+    install(TARGETS ServeFolders LIBRARY DESTINATION lib)
+  else()
+    install(TARGETS ServeFolders LIBRARY DESTINATION lib64)
+  endif()
 endif()
 
 
@@ -546,11 +546,11 @@
     SOVERSION ${ORTHANC_VERSION}
     )
 
-  install(
-    TARGETS ModalityWorklists
-    RUNTIME DESTINATION lib    # Destination for Windows
-    LIBRARY DESTINATION share/orthanc/plugins    # Destination for Linux
-    )
+  if (${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+    install(TARGETS ModalityWorklists LIBRARY DESTINATION lib)
+  else()
+    install(TARGETS ModalityWorklists LIBRARY DESTINATION lib64)
+  endif()
 endif()