diff --git a/router/CMakeLists.txt b/router/CMakeLists.txt
index 5dcf3c3..5681e00 100644
--- a/router/CMakeLists.txt
+++ b/router/CMakeLists.txt
@@ -32,6 +32,8 @@
     src/main.c
     )
 
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${QPID_DISPATCH_HOME}")
+
 add_executable(qdrouterd ${router_SOURCES})
 target_link_libraries(qdrouterd qpid-dispatch ${proton_lib})
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbfae10..4d7f784 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,14 +101,12 @@
 add_library(qpid-dispatch SHARED ${qpid_dispatch_SOURCES})
 target_link_libraries(qpid-dispatch ${Proton_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES})
 set_target_properties(qpid-dispatch PROPERTIES
-  VERSION "${SO_VERSION}"
-  SOVERSION "${SO_VERSION_MAJOR}"
   LINK_FLAGS "${CATCH_UNDEFINED}"
   )
 install(TARGETS qpid-dispatch
   LIBRARY DESTINATION ${QPID_DISPATCH_HOME})
 
 # Set in parent scope for calling cmake file.
-set (QPID_DISPATCH_LIB "libqpid-dispatch.so.${SO_VERSION_MAJOR}" PARENT_SCOPE)
+set (QPID_DISPATCH_LIB "libqpid-dispatch.so" PARENT_SCOPE)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)