diff --git a/chaos/common/CMakeLists.txt b/chaos/common/CMakeLists.txt
index 50cbbbb790332c4410cbbf2241053295f5607a0b..b427cdaa346b4c98d5e2f6ce6063958da020e914 100644
--- a/chaos/common/CMakeLists.txt
+++ b/chaos/common/CMakeLists.txt
@@ -645,7 +645,8 @@ ENDIF()
 
 IF(CHAOS_EPICS_SUPPORT)
   foreach(elib libpvData.a libCom.a)
-      SET(BUILD_LIBRARY ${BUILD_LIBRARY} ${CMAKE_INSTALL_PREFIX}/lib/linux-x86_64/${elib})
+      #${CMAKE_INSTALL_PREFIX}/lib/linux-x86_64/${elib}
+      SET(BUILD_LIBRARY ${BUILD_LIBRARY} ${elib})
   endforeach()
    MESG("Adding Epics support ${BUILD_LIBRARY}")
 ENDIF()
diff --git a/config/CMakeChaos.txt b/config/CMakeChaos.txt
index 1b474e57b79e4a8e835d3428649126aafa6f6312..28882c638fadaa182fb2dca614d2e997767ff2fc 100644
--- a/config/CMakeChaos.txt
+++ b/config/CMakeChaos.txt
@@ -64,7 +64,7 @@ option(GPUFIT "Fast Fitting libraries (needs CUDA toolkit)" OFF)
 IF(CHAOS_EPICS_SUPPORT)
   add_definitions(-DEPICS)
   INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/include/compiler/gcc ${CMAKE_INSTALL_PREFIX}/include/os/Linux )
-
+  LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib/linux-x86_64)
 ENDIF()
 IF(NOT CHAOS_VERSION_MAJOR)
 	 SET(CHAOS_VERSION_MAJOR "1")