diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt
index be2eaa98dd4fef620e69b19840c41aba9d635605..d3913a4a9d9f9eaa9e4d3f838909d645c20b3656 100755
--- a/CoreApp/CMakeLists.txt
+++ b/CoreApp/CMakeLists.txt
@@ -354,7 +354,7 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
   ${OPENGL_LIBRARIES}
   ${COREAPP_ADDITIONAL_LINK_LIBRARIES}
   ${OPENFLIPPER_STATIC_PLUGINS}
-  libglew_shared
+  ${GLEW_TARGET}
 )
 
 
diff --git a/Documentation/DeveloperHelpSources/changelog.docu b/Documentation/DeveloperHelpSources/changelog.docu
index dee62811183c72433714ee8a3fada9e96c521c2f..7cf8d7491b4c615c0bab58103ff34fd7901c4f80 100644
--- a/Documentation/DeveloperHelpSources/changelog.docu
+++ b/Documentation/DeveloperHelpSources/changelog.docu
@@ -18,6 +18,8 @@
          - Updated histogram class
      - <b>Build System</b>
          - Removed glob file operation for coreapp and pluginlib (They have to be explicitly added to the cmake file now)
+         - Added option to disable internal glew (OPENFLIPPER_DISABLE_INTERNAL_GLEW)
+         - Support for QT6
  
 
 
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 938d4b2f360684f80e68a9559d151560b480ee86..6485606b1feb6fbd13687aa1ebba192fb9fd07d7 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -21,7 +21,6 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/libs_required/OpenMesh)
 endif()
 
 # Select appropriate C++ version.
-
 set(OPENFLIPPER_CXX_STANDARD 11 CACHE STRING "C++ standard version to use")
 set_property(CACHE OPENFLIPPER_CXX_STANDARD PROPERTY STRINGS 11 14 17 20 23)
 set(CMAKE_CXX_STANDARD ${OPENFLIPPER_CXX_STANDARD})
@@ -164,7 +163,7 @@ if ( WIN32 )
   endif()
 endif()
 
-set (OF_MAX_QT_VERSION "5.15.2")
+set (OF_MAX_QT_VERSION "6.2.1")
 
 if (${Qt_VERSION_STRING} STRGREATER ${OF_MAX_QT_VERSION})
   message(WARNING "Detected QT Version ( ${Qt_VERSION_STRING}  ) higher than ${OF_MAX_QT_VERSION}!\n" "OpenFlipper has not been tested with this QT Version.")
@@ -285,7 +284,20 @@ enable_testing()
 # Build all additional libraries
 # ========================================================================
 
-add_subdirectory (OpenFlipper/libs_required/glew-cmake)
+
+if (NOT DEFINED OPENFLIPPER_DISABLE_INTERNAL_GLEW)
+  set(OPENFLIPPER_DISABLE_INTERNAL_GLEW "FALSE" CACHE BOOL "Choose if OpenFlipper should build and use the internal glew library" FORCE)
+endif()
+
+if (NOT OPENFLIPPER_DISABLE_INTERNAL_GLEW)
+   add_subdirectory (OpenFlipper/libs_required/glew-cmake)
+   set(GLEW_TARGET libglew_shared)
+else()
+   message("Using external GLEW")
+   find_package(GLEW)
+   set(GLEW_TARGET GLEW::glew)
+endif()
+
 add_subdirectory (OpenFlipper/libs_required/OpenMesh)
 add_subdirectory (OpenFlipper/libs_required/ACG)
 
diff --git a/cmake/FindQWT6.cmake b/cmake/FindQWT6.cmake
index 507a713bda12ade9d03b9688b210e1aa979e37ff..9fc6c164b9b244763800d818170a5aeecb611857 100644
--- a/cmake/FindQWT6.cmake
+++ b/cmake/FindQWT6.cmake
@@ -77,9 +77,7 @@ if (QT5_FOUND)
 else()
    message(" VERSION : ${Qt_VERSION_STRING}")
    if (QT6_FOUND)
-     message("kkkkkkkkkkkkkkk")
      if (${Qt_VERSION_STRING} VERSION_EQUAL "6.2.1")
-     message("llllllllllll")
      SET(ACG_SEARCH_PATH "/ACG/acgdev/gcc-x86_64/qwt-6.2.0-qt6.2.1")
      endif()
     else()
diff --git a/libs_required/ACG/.CMakeLists.txt.swp b/libs_required/ACG/.CMakeLists.txt.swp
new file mode 100644
index 0000000000000000000000000000000000000000..71e8dd4b11b0b736598082f2fcfb5afab557d5bc
Binary files /dev/null and b/libs_required/ACG/.CMakeLists.txt.swp differ
diff --git a/libs_required/ACG/CMakeLists.txt b/libs_required/ACG/CMakeLists.txt
index cc88ac62fc4173d9b2e93127c813e431cb198915..53e023edcccbd0131e82cf2fcd7f89baa8a66364 100644
--- a/libs_required/ACG/CMakeLists.txt
+++ b/libs_required/ACG/CMakeLists.txt
@@ -371,7 +371,7 @@ target_link_libraries ( ACG  ${OPENMESH_LIBRARIES}
                              ${OPENGL_LIBRARIES}
                              ${ADDITIONAL_LINK_LIBRARIES}
                              ${QT_TARGET}::Core ${QT_TARGET}::Widgets ${QT_TARGET}::OpenGL ${QT_TARGET}::Network
-                             libglew_shared )
+                             ${GLEW_TARGET} )
 
 if (QT6_FOUND)
   target_link_libraries( ACG ${QT_TARGET}::OpenGLWidgets )
@@ -436,7 +436,7 @@ if (GTEST_FOUND)
     )
   
     target_link_libraries(ACG_tests
-          ${GTEST_LIBRARIES} ${OPENMESH_LIBRARIES} ACG
+          ${GTEST_LIBRARIES} ${OPENMESH_LIBRARIES} ACG ${GLEW_TARGET}
     )
   
     add_test(NAME AllTestsIn_ACG_tests COMMAND ${OUT_DIR}/ACG_tests)