diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd61071e9..c5c302e9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,9 @@ endif (USE_HDF5)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+set(CMAKE_INSTALL_RPATH "$ORIGIN")
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
 add_subdirectory(slsDetectorSoftware)
 add_subdirectory(slsReceiverSoftware)
 if (QT4_FOUND AND QWT_FOUND)
diff --git a/serverBin/eigerDetectorServer b/serverBin/eigerDetectorServer
index c40e61628..de04d83a9 120000
--- a/serverBin/eigerDetectorServer
+++ b/serverBin/eigerDetectorServer
@@ -1 +1 @@
-../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.21.0
\ No newline at end of file
+../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.10
\ No newline at end of file
diff --git a/serverBin/gotthardDetectorServer b/serverBin/gotthardDetectorServer
new file mode 120000
index 000000000..ca005a699
--- /dev/null
+++ b/serverBin/gotthardDetectorServer
@@ -0,0 +1 @@
+../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6
\ No newline at end of file
diff --git a/serverBin/gotthardDetectorServerv3.0.0.5 b/serverBin/gotthardDetectorServerv3.0.0.5
deleted file mode 120000
index 98922ce43..000000000
--- a/serverBin/gotthardDetectorServerv3.0.0.5
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5
\ No newline at end of file
diff --git a/serverBin/jungfrauDetectorServer b/serverBin/jungfrauDetectorServer
index 0e857cb7e..aeb42a3f9 120000
--- a/serverBin/jungfrauDetectorServer
+++ b/serverBin/jungfrauDetectorServer
@@ -1 +1 @@
-../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.10
\ No newline at end of file
+../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1
\ No newline at end of file