diff --git a/kml/CMakeLists.txt b/kml/CMakeLists.txt
index 4bfa286a58..deed61c885 100644
--- a/kml/CMakeLists.txt
+++ b/kml/CMakeLists.txt
@@ -10,6 +10,8 @@ set(SRC
   serdes_binary.cpp
   serdes_binary.hpp
   serdes_binary_v8.hpp
+  serdes_geojson.cpp
+  serdes_geojson.hpp
   serdes_gpx.cpp
   serdes_gpx.hpp
   type_utils.cpp
diff --git a/kml/serdes_geojson.cpp b/kml/serdes_geojson.cpp
new file mode 100644
index 0000000000..893d5ed2a6
--- /dev/null
+++ b/kml/serdes_geojson.cpp
@@ -0,0 +1,52 @@
+#include "kml/serdes_geojson.hpp"
+
+#include "coding/serdes_json.hpp"
+
+
+namespace kml
+{
+namespace geojson
+{
+
+
+struct GeoJsonFeature
+{
+  DECLARE_VISITOR_AND_DEBUG_PRINT(GeoJsonFeature, visitor(m_type, "type"),
+                                  visitor(m_properties, "properties"))
+
+  bool operator==(GeoJsonFeature const & data) const
+  {
+    return m_type == data.m_type && m_properties == data.m_properties;
+  }
+
+  bool operator!=(GeoJsonFeature const & data) const { return !operator==(data); }
+
+  std::string m_type = "Feature";
+  std::map<std::string, std::string> m_properties;
+};
+
+struct GeoJsonData
+{
+  DECLARE_VISITOR_AND_DEBUG_PRINT(GeoJsonData, visitor(m_type, "type"),
+                                  visitor(m_features, "features"))
+
+  bool operator==(GeoJsonData const & data) const
+  {
+    return m_type == data.m_type;
+  }
+
+  bool operator!=(GeoJsonData const & data) const { return !operator==(data); }
+
+  std::string m_type = "FeatureCollection";
+  std::list<GeoJsonFeature> m_features;
+};
+
+void GeojsonWriter::Write(FileData const & fileData)
+{
+  GeoJsonData data;
+  coding::SerializerJson<Writer> ser(m_writer);
+  ser(data);
+}
+
+}  // namespace geojson
+}  // namespace kml
diff --git a/kml/serdes_geojson.hpp b/kml/serdes_geojson.hpp
new file mode 100644
index 0000000000..ecc9303ee3
--- /dev/null
+++ b/kml/serdes_geojson.hpp
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "kml/types.hpp"
+
+#include "coding/writer.hpp"
+
+#include "base/exception.hpp"
+
+namespace kml
+{
+namespace geojson
+{
+
+class GeojsonWriter
+{
+public:
+  DECLARE_EXCEPTION(WriteGeojsonException, RootException);
+
+  explicit GeojsonWriter(Writer & writer)
+    : m_writer(writer)
+  {}
+
+  void Write(FileData const & fileData);
+
+private:
+  Writer & m_writer;
+};
+
+}  // namespace geojson
+}  // namespace kml