diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2480b26a2298c97e5ebf5b528ae79cbd739c5b94..c5da571bc7e9172b7c4d3cb1136de6976d34a168 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -631,7 +631,7 @@ IF(OTB_USE_PQXX)
         ENDIF (NOT PQ_LIBRARY)
 
 
-# Add compiler option
+        # Add compiler option
         ADD_DEFINITIONS(-DOTB_USE_PQXX)
 
         INCLUDE_DIRECTORIES(${PQXX_INCLUDE_DIR})
diff --git a/OTBConfig.cmake.in b/OTBConfig.cmake.in
index 1469d60cf90c2727b500dd89d12fc130ae29ef22..feda9d6bd410754db2c02b6a25857528d282ad1f 100644
--- a/OTBConfig.cmake.in
+++ b/OTBConfig.cmake.in
@@ -117,6 +117,7 @@ SET(OTB_USE_EXTERNAL_OPENTHREADS "@OTB_USE_EXTERNAL_OPENTHREADS@")
 SET(OTB_USE_EXTERNAL_GDAL "@OTB_USE_EXTERNAL_GDAL@")
 
 # Internationalization
+SET(OTB_USE_GETTEXT "@OTB_USE_GETTEXT@")
 SET(OTB_I18N "@OTB_I18N@")
 SET(OTB_LANG "@OTB_LANG@")
 SET(OTB_LANG_LOCATION "@OTB_LANG_LOCATION@")
@@ -129,8 +130,19 @@ SET(GETTEXT_INTL_LIBRARY "@GETTEXT_INTL_LIBRARY@")
 #Configuration file
 SET(OTB_CONFIG "@OTB_BINARY_DIR@")
 
-#PQXX file
+#PQXX support
 SET(OTB_USE_PQXX "@OTB_USE_PQXX@")
 
 #OTB use patented
-SET(OTB_USE_PATENTED "@OTB_USE_PATENTED@")
\ No newline at end of file
+SET(OTB_USE_PATENTED "@OTB_USE_PATENTED@")
+
+#LibLAS support
+SET(OTB_USE_LIBLAS "@OTB_USE_LIBLAS@")
+SET(OTB_USE_EXTERNAL_LIBLAS "@OTB_USE_LIBLAS@")
+
+#Mapnik support
+SET(OTB_USE_MAPNIK "@OTB_USE_MAPNIK@")
+
+#Jpeg2000 support
+SET(OTB_USE_JPEG2000 "@OTB_USE_JPEG2000@")
+
diff --git a/UseOTB.cmake.in b/UseOTB.cmake.in
index 51d58075bac6a2d9fdb6c9ecb5d7ca63fc919bc9..f3f943d3fdc0112c200164193de93b6ec0c6a320 100644
--- a/UseOTB.cmake.in
+++ b/UseOTB.cmake.in
@@ -148,3 +148,86 @@ IF(OTB_CURL_MULTI_AVAILABLE)
   ADD_DEFINITIONS(-DOTB_CURL_MULTI_AVAILABLE)
 ENDIF(OTB_CURL_MULTI_AVAILABLE)
 
+IF(OTB_USE_LIBLAS)
+IF(OTB_USE_EXTERNAL_LIBLAS)
+    FIND_PATH(LIBLAS_INCLUDE_DIR liblas.hpp)
+    IF(LIBLAS_INCLUDE_DIR)
+      INCLUDE_DIRECTORIES(BEFORE ${LIBLAS_INCLUDE_DIR})
+    ENDIF(LIBLAS_INCLUDE_DIR)
+    
+    FIND_LIBRARY(LIBLAS_LIBRARY NAMES liblas)
+    IF(LIBLAS_LIBRARY)
+      LINK_DIRECTORIES( ${LIBLAS_LIBRARY} )
+    ENDIF(LIBLAS_LIBRARY)
+ENDIF(OTB_USE_EXTERNAL_LIBLAS)
+ENDIF(OTB_USE_LIBLAS)
+
+IF(OTB_USE_MAPNIK)
+        FIND_PATH(MAPNIK_INCLUDE_DIR mapnik/map.hpp PATHS)
+        MARK_AS_ADVANCED(MAPNIK_INCLUDE_DIR)
+        IF (NOT MAPNIK_INCLUDE_DIR)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find MAPNIK include directory. Please set MAPNIK_INCLUDE_DIR or SET OTB_USE_MAPNIK OFF.")
+        ENDIF (NOT MAPNIK_INCLUDE_DIR)
+
+        FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/freetype.h PATHS /usr/include/freetype2)
+        MARK_AS_ADVANCED(FREETYPE2_INCLUDE_DIR)
+        IF (NOT FREETYPE2_INCLUDE_DIR)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find FREETYPE2 include directory. Please set  or SET OTB_USE_MAPNIK OFF.")
+        ENDIF (NOT FREETYPE2_INCLUDE_DIR)
+
+        FIND_LIBRARY(MAPNIK_LIBRARY mapnik )
+        MARK_AS_ADVANCED(MAPNIK_LIBRARY)
+        IF (NOT MAPNIK_LIBRARY)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find MAPNIK library. Please set MAPNIK_LIBRARY or SET OTB_USE_MAPNIK OFF.")
+        ENDIF (NOT MAPNIK_LIBRARY)
+
+        # libicuuc is a unicode library mapnik relies on.
+        # since libicuuc version 1.42, we need to link against it when linking against mapnik
+        # otherwise we get undefined symbol error
+        FIND_LIBRARY(ICUUC_LIBRARY icuuc )
+        MARK_AS_ADVANCED(ICUUC_LIBRARY)
+        IF (NOT ICUUC_LIBRARY)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find ICUUC library, needed by MAPNIK. Please set ICUUC_LIBRARY or SET OTB_USE_MAPNIK OFF.")
+        ENDIF (NOT ICUUC_LIBRARY)
+
+        # Add compiler option
+        ADD_DEFINITIONS(-DOTB_USE_MAPNIK)
+
+        INCLUDE_DIRECTORIES(${MAPNIK_INCLUDE_DIR})
+ENDIF(OTB_USE_MAPNIK)
+
+IF(OTB_USE_PQXX)
+
+        FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
+        MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
+        IF (NOT PQXX_INCLUDE_DIR)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find PQXX include directory. Please set PQXX_INCLUDE_DIR or SET OTB_USE_PQXX OFF.")
+        ENDIF (NOT PQXX_INCLUDE_DIR)
+
+
+        FIND_LIBRARY(PQXX_LIBRARY pqxx )
+        MARK_AS_ADVANCED(PQXX_LIBRARY)
+        IF (NOT PQXX_LIBRARY)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find PQXX library. Please set PQXX_LIBRARY or SET OTB_USE_PQXX OFF.")
+        ENDIF (NOT PQXX_LIBRARY)
+
+        FIND_LIBRARY(PQ_LIBRARY pq )
+        MARK_AS_ADVANCED(PQ_LIBRARY)
+        IF (NOT PQ_LIBRARY)
+                MESSAGE(FATAL_ERROR
+                        "Cannot find PQ library. Please set PQ_LIBRARY or SET OTB_USE_PQXX OFF.")
+        ENDIF (NOT PQ_LIBRARY)
+
+
+        # Add compiler option
+        ADD_DEFINITIONS(-DOTB_USE_PQXX)
+
+        INCLUDE_DIRECTORIES(${PQXX_INCLUDE_DIR})
+        
+ENDIF(OTB_USE_PQXX)