diff --git a/SuperBuild/CMake/External_itk.cmake b/SuperBuild/CMake/External_itk.cmake
index 203615e3227b1f5da56770d133656e68abeb3bc6..c33559d6e52ddab428bd976d45bf6fb05a2b2e2c 100644
--- a/SuperBuild/CMake/External_itk.cmake
+++ b/SuperBuild/CMake/External_itk.cmake
@@ -162,6 +162,20 @@ ExternalProject_Add(ITK
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
   )
 
-#set(ITK_DIFF_FILES ${CMAKE_SOURCE_DIR}/patches/ITK/itk-1-fftw-all.diff)
-#SUPERBUILD_PATCH_SOURCE(ITK "" ${ITK_DIFF_FILES})
 SUPERBUILD_PATCH_SOURCE(ITK)
+
+ExternalProject_Add_Step(ITK POST_INSTALL_2
+  COMMAND ${CMAKE_COMMAND}
+  -DPATCH_DIR=${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.10
+  -DMATCH=${SB_INSTALL_PREFIX}
+  -DPATH_STRIP_COUNT=3
+  -P ${CMAKE_SOURCE_DIR}/CMake/post_install.cmake
+  DEPENDEES install)
+
+ExternalProject_Add_Step(ITK POST_INSTALL_1
+  COMMAND ${CMAKE_COMMAND}
+  -DPATCH_DIR=${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.10/Modules
+  -DMATCH=${SB_INSTALL_PREFIX}
+  -DPATH_STRIP_COUNT=4
+  -P ${CMAKE_SOURCE_DIR}/CMake/post_install.cmake
+  DEPENDEES install)
diff --git a/SuperBuild/Packaging/Files/linux_pkgsetup.in b/SuperBuild/Packaging/Files/linux_pkgsetup.in
index eb98b9d2040269347df982650e1bcaaabae0b64b..7b4b6b8237cf1b157957aeed5f026cd67db2c981 100644
--- a/SuperBuild/Packaging/Files/linux_pkgsetup.in
+++ b/SuperBuild/Packaging/Files/linux_pkgsetup.in
@@ -27,12 +27,13 @@ done
 
 I_AM_XDK=@IS_XDK@
 
-if [ "$I_AM_XDK" = true ] ; then
-    sed -i "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/Modules/ITKZLIB.cmake
-    sed -i "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKConfig.cmake
-    sed -i "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKTargets-release.cmake
-else
+# if [ "$I_AM_XDK" = true ] ; then
+#     sed -i "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/Modules/ITKZLIB.cmake
+#     sed -i "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKConfig.cmake
+#     sed -i "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKTargets-release.cmake
+# else
 
+if [ "$I_AM_XDK" = false ] ; then
 OTB_APP_FILES=$(find $OUT_DIR/lib/otb/applications -maxdepth 1 -type f -exec file {} \; | grep -i elf|cut -f1 -d':')
  # run patchelf
 for app_file in $OTB_APP_FILES; do
diff --git a/SuperBuild/Packaging/Files/macx_pkgsetup.in b/SuperBuild/Packaging/Files/macx_pkgsetup.in
index 8c35f329a10151a2c41a11146490d7363b1e4017..cf06288424309db3e65925854854f55a7e7783c6 100755
--- a/SuperBuild/Packaging/Files/macx_pkgsetup.in
+++ b/SuperBuild/Packaging/Files/macx_pkgsetup.in
@@ -47,16 +47,16 @@ SHORT_VERSION_STRING=@Monteverdi_VERSION_MAJOR@.@Monteverdi_VERSION_MINOR@
 
 I_AM_XDK=@IS_XDK@
 
-if [ "$I_AM_XDK" = true ] ; then
-
-    sed -i "" "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/Modules/ITKZLIB.cmake
-    sed -i "" "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKConfig.cmake
-    sed -i "" "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKTargets-release.cmake
-else
+# if [ "$I_AM_XDK" = true ] ; then
 
+#     sed -i "" "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/Modules/ITKZLIB.cmake
+#     sed -i "" "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKConfig.cmake
+#     sed -i "" "s,@DEPENDENCIES_INSTALL_DIR@,$OUT_DIR,g" lib/cmake/ITK-@PKG_ITK_SB_VERSION@/ITKTargets-release.cmake
+# else
+if [ "$I_AM_XDK" = false ] ; then
     rm -fr "Mapla.app"
     rm -fr "Monteveridi.app"
-
+    
     mkdir -p "Mapla.app/Contents/MacOS"
     mkdir -p "Mapla.app/Contents/Resources"
     mkdir -p "Monteverdi.app/Contents/MacOS"