diff --git a/msautotest/wxs/expected/wfsogr10_bnazip.zip b/msautotest/wxs/expected/wfsogr10_bnazip.zip
deleted file mode 100644
index e0706818d3..0000000000
Binary files a/msautotest/wxs/expected/wfsogr10_bnazip.zip and /dev/null differ
diff --git a/msautotest/wxs/expected/wfsogr10_caps.xml b/msautotest/wxs/expected/wfsogr10_caps.xml
index 1082857629..8adaab5131 100644
--- a/msautotest/wxs/expected/wfsogr10_caps.xml
+++ b/msautotest/wxs/expected/wfsogr10_caps.xml
@@ -60,7 +60,7 @@ Content-Type: text/xml; charset=UTF-8
         <CSVSTREAM/>
         <OGRGML/>
         <OGRGPX/>
-        <OGRBNAZIP/>
+        <OGRCSVZIP/>
         <SHAPEZIP/>
         <MIDMIF/>
         <MultiMIDMIF/>
diff --git a/msautotest/wxs/expected/wfsogr10_csvzip.zip b/msautotest/wxs/expected/wfsogr10_csvzip.zip
new file mode 100644
index 0000000000..3e93c070ff
Binary files /dev/null and b/msautotest/wxs/expected/wfsogr10_csvzip.zip differ
diff --git a/msautotest/wxs/expected/wfsogr11_caps.xml b/msautotest/wxs/expected/wfsogr11_caps.xml
index e744eb17f4..a7df5b9176 100644
--- a/msautotest/wxs/expected/wfsogr11_caps.xml
+++ b/msautotest/wxs/expected/wfsogr11_caps.xml
@@ -91,7 +91,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:Value>text/csv; streamed</ows:Value>
         <ows:Value>text/xml; subtype=gml/2.1.2; driver=ogr</ows:Value>
         <ows:Value>application/gpx+xml; streamed</ows:Value>
-        <ows:Value>application/zip; driver=ogr/bna</ows:Value>
+        <ows:Value>application/zip; driver=ogr/csv</ows:Value>
         <ows:Value>application/shapefile</ows:Value>
         <ows:Value>MIDMIF</ows:Value>
         <ows:Value>MultiMIDMIF</ows:Value>
@@ -113,7 +113,7 @@ Content-Type: text/xml; charset=UTF-8
         <Format>text/csv; streamed</Format>
         <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
         <Format>application/gpx+xml; streamed</Format>
-        <Format>application/zip; driver=ogr/bna</Format>
+        <Format>application/zip; driver=ogr/csv</Format>
         <Format>application/shapefile</Format>
         <Format>MIDMIF</Format>
         <Format>MultiMIDMIF</Format>
@@ -153,7 +153,7 @@ Content-Type: text/xml; charset=UTF-8
         <Format>text/csv; streamed</Format>
         <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
         <Format>application/gpx+xml; streamed</Format>
-        <Format>application/zip; driver=ogr/bna</Format>
+        <Format>application/zip; driver=ogr/csv</Format>
         <Format>application/shapefile</Format>
         <Format>MIDMIF</Format>
         <Format>MultiMIDMIF</Format>
@@ -174,7 +174,7 @@ Content-Type: text/xml; charset=UTF-8
         <Format>text/csv; streamed</Format>
         <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
         <Format>application/gpx+xml; streamed</Format>
-        <Format>application/zip; driver=ogr/bna</Format>
+        <Format>application/zip; driver=ogr/csv</Format>
         <Format>application/shapefile</Format>
         <Format>MIDMIF</Format>
         <Format>MultiMIDMIF</Format>
diff --git a/msautotest/wxs/expected/wfsogr11_caps.xml.alternative b/msautotest/wxs/expected/wfsogr11_caps.xml.alternative
index e814e5920f..0b33b68534 100644
--- a/msautotest/wxs/expected/wfsogr11_caps.xml.alternative
+++ b/msautotest/wxs/expected/wfsogr11_caps.xml.alternative
@@ -91,7 +91,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:Value>text/csv; streamed</ows:Value>
         <ows:Value>text/xml; subtype=gml/2.1.2; driver=ogr</ows:Value>
         <ows:Value>application/gpx+xml; streamed</ows:Value>
-        <ows:Value>application/zip; driver=ogr/bna</ows:Value>
+        <ows:Value>application/zip; driver=ogr/csv</ows:Value>
         <ows:Value>application/shapefile</ows:Value>
         <ows:Value>MIDMIF</ows:Value>
         <ows:Value>MultiMIDMIF</ows:Value>
@@ -113,7 +113,7 @@ Content-Type: text/xml; charset=UTF-8
         <Format>text/csv; streamed</Format>
         <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
         <Format>application/gpx+xml; streamed</Format>
-        <Format>application/zip; driver=ogr/bna</Format>
+        <Format>application/zip; driver=ogr/csv</Format>
         <Format>application/shapefile</Format>
         <Format>MIDMIF</Format>
         <Format>MultiMIDMIF</Format>
@@ -153,7 +153,7 @@ Content-Type: text/xml; charset=UTF-8
         <Format>text/csv; streamed</Format>
         <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
         <Format>application/gpx+xml; streamed</Format>
-        <Format>application/zip; driver=ogr/bna</Format>
+        <Format>application/zip; driver=ogr/csv</Format>
         <Format>application/shapefile</Format>
         <Format>MIDMIF</Format>
         <Format>MultiMIDMIF</Format>
@@ -174,7 +174,7 @@ Content-Type: text/xml; charset=UTF-8
         <Format>text/csv; streamed</Format>
         <Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
         <Format>application/gpx+xml; streamed</Format>
-        <Format>application/zip; driver=ogr/bna</Format>
+        <Format>application/zip; driver=ogr/csv</Format>
         <Format>application/shapefile</Format>
         <Format>MIDMIF</Format>
         <Format>MultiMIDMIF</Format>
diff --git a/msautotest/wxs/expected/wfsogr_addfiles_onelayer.zip b/msautotest/wxs/expected/wfsogr_addfiles_onelayer.zip
index 86a322b140..c06d9e52bc 100644
Binary files a/msautotest/wxs/expected/wfsogr_addfiles_onelayer.zip and b/msautotest/wxs/expected/wfsogr_addfiles_onelayer.zip differ
diff --git a/msautotest/wxs/wfs_ogr.map b/msautotest/wxs/wfs_ogr.map
index 82c7209267..abfa4994a5 100644
--- a/msautotest/wxs/wfs_ogr.map
+++ b/msautotest/wxs/wfs_ogr.map
@@ -23,8 +23,8 @@
 # Generate dump streamed directly to GPX (test #4776)
 # RUN_PARMS: wfsogr10_gpx.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRGPX" > [RESULT_DEVERSION]
 #
-# Generate dump to BNA in ZIP (test #4933)
-# RUN_PARMS: wfsogr10_bnazip.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRBNAZIP" > [RESULT_DEVERSION]
+# Generate dump to CSV in ZIP (test #4933)
+# RUN_PARMS: wfsogr10_csvzip.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRCSVZIP" > [RESULT_DEVERSION]
 #
 # Generate dump to SHAPEZIP
 # RUN_PARMS: wfsogr10_shapezip.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=SHAPEZIP" > [RESULT]
@@ -91,7 +91,7 @@
 #
 # Test wfs_additional_files_in_output
 # RUN_PARMS: wfsogr_addfiles_onelayer.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles&featureid=road_with_addfiles.1521&OUTPUTFORMAT=OGRGML" > [RESULT_DEVERSION]
-# RUN_PARMS: wfsogr_addfiles_onelayer.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles&featureid=road_with_addfiles.1521&OUTPUTFORMAT=OGRBNAZIP" > [RESULT_DEVERSION]
+# RUN_PARMS: wfsogr_addfiles_onelayer.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles&featureid=road_with_addfiles.1521&OUTPUTFORMAT=OGRCSVZIP" > [RESULT_DEVERSION]
 # RUN_PARMS: wfsogr_addfiles_twolayers.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles,road2_with_addfiles&featureid=road_with_addfiles.1521,road2_with_addfiles.1521&OUTPUTFORMAT=OGRGML" > [RESULT_DEVERSION]
 
 MAP
@@ -151,12 +151,13 @@ OUTPUTFORMAT
 END
 
 OUTPUTFORMAT
-  NAME "OGRBNAZIP"
-  DRIVER "OGR/BNA"
-  MIMETYPE "application/zip; driver=ogr/bna"
+  NAME "OGRCSVZIP"
+  DRIVER "OGR/CSV"
+  MIMETYPE "application/zip; driver=ogr/csv"
+  FORMATOPTION "LCO:GEOMETRY=AS_WKT"
   FORMATOPTION "STORAGE=memory"
   FORMATOPTION "FORM=zip"
-  FORMATOPTION "FILENAME=result.bna.zip"
+  FORMATOPTION "FILENAME=result.csv.zip"
 END
 
 
@@ -245,7 +246,7 @@ LAYER
     "ows_title"         "road"
     "ows_description"   "road"
     "wfs_featureid"     "ROAD_ID" 
-    "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrbnazip,ogrgmlstream,shapezip,midmif,multimidmif"
+    "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrcsvzip,ogrgmlstream,shapezip,midmif,multimidmif"
     "gml_include_items" "all"
     "gml_exclude_items" "ROAD_"
     "gml_types"         "auto"
@@ -292,7 +293,7 @@ LAYER
     "ows_title"         "road_with_addfiles"
     "ows_description"   "road_with_addfiles"
     "wfs_featureid"     "ROAD_ID" 
-    "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrbnazip,ogrgmlstream,shapezip,midmif,multimidmif"
+    "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrcsvzip,ogrgmlstream,shapezip,midmif,multimidmif"
     "wfs_additional_files_in_output" "wfs_ogr_common_addfile.txt,wfs_ogr_common_addfile.txt,addfiles/,addfiles,road_with_addfiles.txt"
     "gml_include_items" "all"
     "gml_exclude_items" "ROAD_"
@@ -316,7 +317,7 @@ LAYER
     "ows_title"         "road2_with_addfiles"
     "ows_description"   "road2_with_addfiles"
     "wfs_featureid"     "ROAD_ID" 
-    "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrbnazip,ogrgmlstream,shapezip,midmif,multimidmif"
+    "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrcsvzip,ogrgmlstream,shapezip,midmif,multimidmif"
     "wfs_additional_files_in_output" "road2_with_addfiles.txt,nonexistingfile"
     "gml_include_items" "all"
     "gml_exclude_items" "ROAD_"