diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891923ceaaa0ee65c0b87af295cafb237dce0dae..264a421644fbc0539b3abc2a996c2e311ddebf43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,13 @@
 cmake_minimum_required (VERSION 2.8.9)
 
+# ACG Environment default settings
+# This is ugly but currently we need to work around the default installed 5.3 on debian
+if ( EXISTS /ACG/acgdev/gcc-4.9-x86_64/qt-5.5.1/5.5/gcc_64/ )
+  # Default to this install path for QT%_INSTALL_DIR
+  set (QT5_INSTALL_PATH /ACG/acgdev/gcc-4.9-x86_64/qt-5.5.1/5.5/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
+endif()
+
+
 if ( WIN32 )
   # This is the base directory for windows library search used in the finders we shipp.
   set(CMAKE_WINDOWS_LIBS_DIR "c:/libs" CACHE STRING "Default Library search dir on windows." )
diff --git a/cmake/FindQwt6.cmake b/cmake/FindQwt6.cmake
index b886b069a3f6ff5ae2e9cc272e533115c1f77b45..f044c0700793bd45223402d33cfec138f9c5a805 100644
--- a/cmake/FindQwt6.cmake
+++ b/cmake/FindQwt6.cmake
@@ -29,7 +29,7 @@ endif()
 
 if (QT5_FOUND)
     if (${Qt5Core_VERSION_STRING} VERSION_EQUAL "5.5.1" OR ${Qt5Core_VERSION_STRING} VERSION_GREATER "5.5.1")
-        SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5")
+        SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1.2-qt5.5.1")
     else()
         SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-4.9-x86_64/qwt-6.1-qt5")
     endif()