diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4938cbf676cf120d427a8d1f9e3c3ac643a2335c..2b5912454d02ba2d6645d90f403f204b9cc85f3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,8 @@ IF(OTB_USE_VISU_GUI)
 
         FIND_PACKAGE(FLTK)
         IF(FLTK_FOUND)
-           INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR})
+           INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIRS})
+	   LINK_DIRECTORIES(${FLTK_LIBRARY_DIRS})
         ELSE(FLTK_FOUND)
            MESSAGE(FATAL_ERROR
 	         "Cannot build OTB project without FLTK.  Please set FLTK_DIR or set OTB_USE_VISU to OFF.")
diff --git a/OTBConfig.cmake.in b/OTBConfig.cmake.in
index 0930b4615d871cdb47b178bba9a795158f3c9f04..ca106f85a47447f5fd1d6ebd7d2ebf7ecf981a92 100644
--- a/OTBConfig.cmake.in
+++ b/OTBConfig.cmake.in
@@ -64,3 +64,4 @@ SET(OTB_USE_SYSTEM_VXL "@OTB_USE_SYSTEM_VXL@")
 SET(OTB_VXL_DIR "@OTB_VXL_DIR@")
 
 SET(OTB_FLTK_FLUID_EXECUTABLE "@FLTK_FLUID_EXECUTABLE@")
+SET(OTB_ITK_DIR "@ITK_DIR@")
diff --git a/UseOTB.cmake.in b/UseOTB.cmake.in
index aa28eee39bc80ac5204398fc25780cae7cb03903..38722777cf95d86878bcf369969253d8e748f046 100644
--- a/UseOTB.cmake.in
+++ b/UseOTB.cmake.in
@@ -22,6 +22,7 @@ INCLUDE_DIRECTORIES(BEFORE ${OTB_INCLUDE_DIRS})
 
 # Add link directories needed to use OTB.
 LINK_DIRECTORIES(${OTB_LIBRARY_DIRS})
+MESSAGE(${OTB_LIBRARY_DIRS})
 
 # Load settings fro the system VXL with which OTB was built, if any.
 IF(OTB_USE_SYSTEM_VXL)
@@ -68,3 +69,8 @@ IF(OTB_USE_SYSTEM_VXL)
 ENDIF(OTB_USE_SYSTEM_VXL)
 
 SET(FLTK_FLUID_EXECUTABLE ${OTB_FLTK_FLUID_EXECUTABLE})
+#WHERE TO FIND ITK
+IF(OTB_USE_EXTERNAL_ITK)
+INCLUDE(${OTB_ITK_DIR}/ITKConfig.cmake)
+INCLUDE(${ITK_USE_FILE})
+ENDIF(OTB_USE_EXTERNAL_ITK)
diff --git a/otbGenerateOTBConfig.cmake b/otbGenerateOTBConfig.cmake
index 9784ba4ceb2de0491dcdca6fd270f9c2dc42dcca..d77930a5cce793189c851886d075994afccd2c1d 100644
--- a/otbGenerateOTBConfig.cmake
+++ b/otbGenerateOTBConfig.cmake
@@ -18,7 +18,7 @@ SET(OTB_BUILD_SETTINGS_FILE ${OTB_BINARY_DIR}/OTBBuildSettings.cmake)
 SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_PATH})
 
 
-SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_DIRS_CONFIG} ${GDAL_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS} )
+SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_DIRS_CONFIG} ${GDAL_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS})
 
 # Determine the include directories needed.
 SET(OTB_INCLUDE_DIRS_CONFIG
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index e192cc3513601132f8244ad481c07fd3d5fbd669..9ff14dfbd161db87eaf089fbe3d2f629b9b1cf01 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -66,7 +66,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX)
 SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX} )
 
 SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
-  		${GDAL_INCLUDE_DIRS} )
+  		${GDAL_INCLUDE_DIRS} ${FLTK_INCLUDE_DIRS} )
 
 IF(OTB_USE_EXTERNAL_ITK)
 	SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
@@ -104,7 +104,7 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
 )
 
 SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
-  		${GDAL_INCLUDE_DIRS} )
+  		${GDAL_INCLUDE_DIRS} ${FLTK_INCLUDE_DIRS})
 
 IF(OTB_USE_EXTERNAL_ITK)
 	SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}