diff --git a/plugins/input/occi/occi_datasource.cpp b/plugins/input/occi/occi_datasource.cpp
index 2677f3c56..703854414 100644
--- a/plugins/input/occi/occi_datasource.cpp
+++ b/plugins/input/occi/occi_datasource.cpp
@@ -73,6 +73,7 @@ occi_datasource::occi_datasource(parameters const& params, bool bind)
     : datasource (params),
       type_(datasource::Vector),
       table_(*params_.get<std::string>("table","")),
+      fields_(*params_.get<std::string>("fields","*")),
       geometry_field_(*params_.get<std::string>("geometry_field","")),
       extent_initialized_(false),
       desc_(*params_.get<std::string>("type"), *params_.get<std::string>("encoding","utf-8")),
@@ -194,7 +195,7 @@ void occi_datasource::bind() const
     // get columns description
     {
         std::ostringstream s;
-        s << "SELECT * FROM (" << table_name << ") WHERE rownum < 1";
+        s << "SELECT " fields_ << " FROM (" << table_name << ") WHERE rownum < 1";
 
         try
         {
diff --git a/plugins/input/occi/occi_datasource.hpp b/plugins/input/occi/occi_datasource.hpp
index f1b90a032..25c24da35 100644
--- a/plugins/input/occi/occi_datasource.hpp
+++ b/plugins/input/occi/occi_datasource.hpp
@@ -51,6 +51,7 @@ class occi_datasource : public mapnik::datasource
    private:
       int type_;
       mutable std::string table_;
+      mutable std::string fields_;
       mutable std::string geometry_field_;
       mutable int srid_;
       mutable bool extent_initialized_;