diff --git a/src/ol/format/gmlformat.js b/src/ol/format/gmlformat.js
index 54b56f58bf..bca113ca33 100644
--- a/src/ol/format/gmlformat.js
+++ b/src/ol/format/gmlformat.js
@@ -1238,13 +1238,37 @@ ol.format.GML.writeMultiSurface_ = function(node, geometry,
   var polygons = geometry.getPolygons();
   for (var i = 0, ii = polygons.length; i < ii; ++i) {
     ol.xml.pushSerializeAndPop({node: node, srsName: srsName},
-        ol.format.GML.SURFACEMEMBER_SERIALIZERS_,
+        ol.format.GML.SURFACEORPOLYGONMEMBER_SERIALIZERS_,
         ol.xml.makeSimpleNodeFactory('surfaceMember'), [polygons[i]],
         objectStack);
   }
 };
 
 
+/**
+ * @param {Node} node Node.
+ * @param {ol.geom.MultiPolygon} geometry MultiPolygon geometry.
+ * @param {Array.<*>} objectStack Node stack.
+ * @private
+ */
+ol.format.GML.writeMultiPolygon_ = function(node, geometry,
+    objectStack) {
+  var context = objectStack[objectStack.length - 1];
+  goog.asserts.assert(goog.isObject(context));
+  var srsName = goog.object.get(context, 'srsName');
+  if (goog.isDefAndNotNull(srsName)) {
+    node.setAttribute('srsName', srsName);
+  }
+  var polygons = geometry.getPolygons();
+  for (var i = 0, ii = polygons.length; i < ii; ++i) {
+    ol.xml.pushSerializeAndPop({node: node, srsName: srsName},
+        ol.format.GML.SURFACEORPOLYGONMEMBER_SERIALIZERS_,
+        ol.xml.makeSimpleNodeFactory('polygonMember'), [polygons[i]],
+        objectStack);
+  }
+};
+
+
 /**
  * @param {Node} node Node.
  * @param {ol.geom.MultiPoint} geometry MultiPoint geometry.
@@ -1317,7 +1341,8 @@ ol.format.GML.writeRing_ = function(node, ring, objectStack) {
  * @param {Array.<*>} objectStack Node stack.
  * @private
  */
-ol.format.GML.writeSurfaceMember_ = function(node, polygon, objectStack) {
+ol.format.GML.writeSurfaceOrPolygonMember_ = function(node, polygon,
+    objectStack) {
   var context = objectStack[objectStack.length - 1];
   goog.asserts.assert(goog.isObject(context));
   var srsName = goog.object.get(context, 'srsName');
@@ -1400,9 +1425,12 @@ ol.format.GML.writeCurveSegments_ = function(node, line, objectStack) {
  * @type {Object.<string, Object.<string, ol.xml.Serializer>>}
  * @private
  */
-ol.format.GML.SURFACEMEMBER_SERIALIZERS_ = {
+ol.format.GML.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = {
   'http://www.opengis.net/gml': {
-    'surfaceMember': ol.xml.makeChildAppender(ol.format.GML.writeSurfaceMember_)
+    'SURFACEORsurfaceMember': ol.xml.makeChildAppender(
+        ol.format.GML.writeSurfaceOrPolygonMember_),
+    'polygonMember': ol.xml.makeChildAppender(
+        ol.format.GML.writeSurfaceOrPolygonMember_)
   }
 };
 
@@ -1501,6 +1529,7 @@ ol.format.GML.GEOMETRY_SERIALIZERS_ = {
         ol.format.GML.writeMultiLineString_),
     'LinearRing': ol.xml.makeChildAppender(ol.format.GML.writeLinearRing_),
     'Polygon': ol.xml.makeChildAppender(ol.format.GML.writePolygon_),
+    'MultiPolygon': ol.xml.makeChildAppender(ol.format.GML.writeMultiPolygon_),
     'Surface': ol.xml.makeChildAppender(ol.format.GML.writeSurface_),
     'MultiSurface': ol.xml.makeChildAppender(ol.format.GML.writeMultiSurface_)
   }
@@ -1525,7 +1554,7 @@ ol.format.GML.GEOMETRY_NODE_FACTORY_ = function(value, objectStack,
   var parentNode = objectStack[objectStack.length - 1].node;
   goog.asserts.assert(ol.xml.isNode(parentNode));
   var nodeName = value.getType();
-  if (nodeName === 'MultiPolygon') {
+  if (nodeName === 'MultiPolygon' && surface === true) {
     nodeName = 'MultiSurface';
   }
   if (nodeName === 'Polygon' && surface === true) {
diff --git a/test/spec/ol/format/gmlformat.test.js b/test/spec/ol/format/gmlformat.test.js
index da05ccd515..826efb0c56 100644
--- a/test/spec/ol/format/gmlformat.test.js
+++ b/test/spec/ol/format/gmlformat.test.js
@@ -82,7 +82,7 @@ describe('ol.format.GML', function() {
             expect(serialized.firstElementChild).to.xmleql(ol.xml.load(text));
           });
 
-      it('can read and write multi surface geometry with right axis order',
+      it('can read a surface geometry with right axis order',
           function() {
             var text =
                 '<gml:MultiSurface xmlns:gml="http://www.opengis.net/gml" ' +
@@ -105,8 +105,6 @@ describe('ol.format.GML', function() {
             var g = readGeometry(format, text);
             expect(g.getCoordinates()[0][0][0][0]).to.equal(-77.0081);
             expect(g.getCoordinates()[0][0][0][1]).to.equal(38.9661);
-            var serialized = formatWGS84.writeGeometry(g);
-            expect(serialized.firstElementChild).to.xmleql(ol.xml.load(text));
           });
 
     });
@@ -352,7 +350,7 @@ describe('ol.format.GML', function() {
 
     describe('multipolygon', function() {
 
-      it('can read a singular multipolygon geometry', function() {
+      it('can read and write a singular multipolygon geometry', function() {
         var text =
             '<gml:MultiPolygon xmlns:gml="http://www.opengis.net/gml" ' +
             '    srsName="CRS:84">' +
@@ -392,6 +390,8 @@ describe('ol.format.GML', function() {
             [1, 2, 0]], [[2, 3, 0], [2, 5, 0], [4, 5, 0], [2, 3, 0]],
             [[3, 4, 0], [3, 6, 0], [5, 6, 0], [3, 4, 0]]],
           [[[1, 2, 0], [3, 2, 0], [3, 4, 0], [1, 2, 0]]]]);
+        var serialized = format.writeGeometry(g);
+        expect(serialized.firstElementChild).to.xmleql(ol.xml.load(text));
       });
 
       it('can read a plural multipolygon geometry', function() {