diff --git a/CMakeExternals/CTK.cmake b/CMakeExternals/CTK.cmake
index 7e0b8ad916..8b3e23205b 100644
--- a/CMakeExternals/CTK.cmake
+++ b/CMakeExternals/CTK.cmake
@@ -1,112 +1,105 @@
 #-----------------------------------------------------------------------------
 # CTK
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_CTK)
 
   # Sanity checks
   if(DEFINED CTK_DIR AND NOT EXISTS ${CTK_DIR})
     message(FATAL_ERROR "CTK_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj CTK)
   set(proj_DEPENDENCIES DCMTK)
   set(CTK_DEPENDS ${proj})
 
   if(NOT DEFINED CTK_DIR)
 
-    set(revision_tag 3050b649)
-    #IF(${proj}_REVISION_TAG)
-    #  SET(revision_tag ${${proj}_REVISION_TAG})
-    #ENDIF()
+    set(revision_tag 0887c8b2) # From https://github.com/kislinsk/CTK.git
 
     set(ctk_optional_cache_args )
     if(MITK_USE_Python)
       if(NOT MITK_USE_SYSTEM_PYTHON)
         list(APPEND proj_DEPENDENCIES Python)
       endif()
       list(APPEND ctk_optional_cache_args
            -DCTK_LIB_Scripting/Python/Widgets:BOOL=ON
            -DCTK_ENABLE_Python_Wrapping:BOOL=ON
            -DCTK_APP_ctkSimplePythonShell:BOOL=ON
            -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
            -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
            -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2}
            -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
       )
     else()
       list(APPEND ctk_optional_cache_args
            -DCTK_LIB_Scripting/Python/Widgets:BOOL=OFF
            -DCTK_ENABLE_Python_Wrapping:BOOL=OFF
            -DCTK_APP_ctkSimplePythonShell:BOOL=OFF
       )
     endif()
 
     if(NOT MITK_USE_Python)
       list(APPEND ctk_optional_cache_args
         -DDCMTK_CMAKE_DEBUG_POSTFIX:STRING=d
       )
     endif()
 
     if(CTEST_USE_LAUNCHERS)
       list(APPEND ctk_optional_cache_args
         "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake"
       )
     endif()
 
     FOREACH(type RUNTIME ARCHIVE LIBRARY)
       IF(DEFINED CTK_PLUGIN_${type}_OUTPUT_DIRECTORY)
         LIST(APPEND mitk_optional_cache_args -DCTK_PLUGIN_${type}_OUTPUT_DIRECTORY:PATH=${CTK_PLUGIN_${type}_OUTPUT_DIRECTORY})
       ENDIF()
     ENDFOREACH()
 
     ExternalProject_Add(${proj}
       LIST_SEPARATOR ${sep}
       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz
-      #GIT_REPOSITORY https://github.com/commontk/CTK.git
-      #GIT_TAG origin/master
-      URL_MD5 d6c13dd6fd99d08a9fc7d319ce3b366e
-      PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/CTK.patch
+      URL_MD5 e7997d53c556f45b6eadb7bdf1645280
+      # PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/CTK.patch
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${ctk_optional_cache_args}
         # The CTK PluginFramework cannot cope with
         # a non-empty CMAKE_DEBUG_POSTFIX for the plugin
         # libraries yet.
         -DCMAKE_DEBUG_POSTFIX:STRING=
         -DCTK_QT_VERSION:STRING=5
         -DGit_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
         -DGIT_EXECUTABLE:FILEPATH=${GIT_EXECUTABLE}
         -DCTK_LIB_CommandLineModules/Backend/LocalProcess:BOOL=ON
         -DCTK_LIB_CommandLineModules/Frontend/QtGui:BOOL=ON
         -DCTK_LIB_PluginFramework:BOOL=ON
         -DCTK_LIB_DICOM/Widgets:BOOL=ON
         -DCTK_LIB_XNAT/Core:BOOL=ON
         -DCTK_PLUGIN_org.commontk.eventadmin:BOOL=ON
         -DCTK_PLUGIN_org.commontk.configadmin:BOOL=ON
         -DCTK_USE_GIT_PROTOCOL:BOOL=OFF
         -DDCMTK_DIR:PATH=${DCMTK_DIR}
         -DqRestAPI_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/qRestAPI_c5e4c2a7_patched.tar.gz
-        -DPythonQt_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/PythonQt_1660b8bd.tar.gz
+        -DPythonQt_URL:STRING=${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/PythonQt_e39be131.tar.gz # From https://github.com/kislinsk/PythonQt.git
       CMAKE_CACHE_ARGS
         ${ep_common_cache_args}
       CMAKE_CACHE_DEFAULT_ARGS
         ${ep_common_cache_default_args}
       DEPENDS ${proj_DEPENDENCIES}
      )
 
     ExternalProject_Get_Property(${proj} binary_dir)
     set(CTK_DIR ${binary_dir})
-    #set(CTK_DIR ${ep_prefix})
-    #mitkFunctionInstallExternalCMakeProject(${proj})
 
   else()
 
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
   endif()
 
 endif()
diff --git a/CMakeExternals/CTK.patch b/CMakeExternals/CTK.patch
deleted file mode 100644
index fa7fe5f50c..0000000000
--- a/CMakeExternals/CTK.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeExternals/PythonQt.cmake b/CMakeExternals/PythonQt.cmake
-index 806797b..b70005d 100644
---- a/CMakeExternals/PythonQt.cmake
-+++ b/CMakeExternals/PythonQt.cmake
-@@ -33,7 +33,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
- 
-   # Enable Qt libraries PythonQt wrapping if required
-   if (CTK_QT_VERSION VERSION_GREATER "4")
--    set(qtlibs Core Gui Widgets Network OpenGL PrintSupport Sql Svg UiTools WebKit WebKitWidgets Xml)
-+    set(qtlibs Core Gui Widgets Network OpenGL PrintSupport Sql Svg UiTools Xml)
-   else()
-     list(APPEND ep_PythonQt_args
-       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-@@ -88,7 +88,6 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
-     BUILD_COMMAND ""
-     CMAKE_CACHE_ARGS
-       ${ep_common_cache_args}
--      -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-       -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
-       -DPYTHON_INCLUDE_DIR2:PATH=${PYTHON_INCLUDE_DIR2}
-       -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
-diff --git a/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp b/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp
-index 9b9ec055..464cece1 100644
---- a/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp
-+++ b/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp
-@@ -19,6 +19,7 @@
- =========================================================================*/
- 
- // Qt includes
-+#include <QByteArray>
- #include <QDir>
- #include <QDebug>
- 
-@@ -482,7 +483,7 @@ PyObject* ctkAbstractPythonManager::pythonObject(const QString& variableNameAndF
-           continue;
-           }
-         QString keyStr = PyString_AsString(key);
--        if (keyStr.operator ==(compareFunction))
-+        if (keyStr == compareFunction)
-           {
-           finalPythonObject = value;
-           break;
-@@ -509,7 +510,7 @@ PyObject* ctkAbstractPythonManager::pythonModule(const QString& module)
-     }
-   foreach(const QString& module, moduleList)
-     {
--    object = PyDict_GetItemString(dict, module.toAscii().data());
-+    object = PyDict_GetItemString(dict, module.toLatin1().data());
-     if (prevObject)
-       {
-       Py_DECREF(prevObject);