diff --git a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx b/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
index 1328951b1767ce40a943d1e5e45efe86c09433c2..c527dcc8828527b1a74bc2af07d712cafa8f3303 100644
--- a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
+++ b/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
@@ -21,8 +21,11 @@
 // Elevation handler
 #include "otbWrapperElevationParametersHandler.h"
 
+#ifdef OTB_USE_SIFTFAST
 #include "otbSiftFastImageFilter.h"
+#else
 #include "otbImageToSIFTKeyPointSetFilter.h"
+#endif
 #include "otbImageToSURFKeyPointSetFilter.h"
 #include "otbKeyPointSetsMatchingFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
diff --git a/Applications/Utils/otbReadImageInfo.cxx b/Applications/Utils/otbReadImageInfo.cxx
index 4af68cb1e3bac301bab994cfb3a688d07231e852..d2e350d4e2f0af6ef14a16ba1134a9be696985fd 100644
--- a/Applications/Utils/otbReadImageInfo.cxx
+++ b/Applications/Utils/otbReadImageInfo.cxx
@@ -68,6 +68,11 @@ private:
     SetParameterDescription("keywordlist", "Output the OSSIM keyword list. It contains metadata information (sensor model, geometry ). Informations are stored in keyword list (pairs of key/value)");
     DisableParameter("keywordlist");
     MandatoryOff("keywordlist");
+
+    AddParameter(ParameterType_OutputFilename, "outkwl", "Write the OSSIM keywordlist to a geom file");
+    SetParameterDescription("outkwl", "This option allows to extract the OSSIM keywordlist of the image into a geom file.");
+    MandatoryOff("outkwl");
+    
     //Create output parameters to store image informations
     AddParameter(ParameterType_Int,"sizex","Size X");
     SetParameterDescription("sizex","X size (in pixels)");
@@ -448,6 +453,14 @@ private:
 
     //Display image informations in the dedicated logger
     otbAppLogINFO( << ossOutput.str() );
+
+    if(IsParameterEnabled("outkwl"))
+      {
+      metadataInterface->GetImageKeywordlist()
+      
+
+      }
+
   }
 
 };