diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile
index 6dea414bba3..bac5ecad026 100644
--- a/geo/gdal/Makefile
+++ b/geo/gdal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.56 2017/04/10 11:46:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2017/05/19 09:19:48 landry Exp $
 
 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
 COMMENT-perl =	perl bindings for GDAL
 
-V =		2.1.3
+V =		2.2.0
 DISTNAME =	gdal-${V}
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		gdalautotest-${V}${EXTRACT_SUFX}
@@ -13,7 +13,7 @@ PKGNAME-main =	${DISTNAME}
 PKGNAME-python =py-${DISTNAME}
 PKGNAME-perl =	p5-Geo-GDAL-${V}
 
-SHARED_LIBS =	gdal 28.0 #21.3
+SHARED_LIBS =	gdal 29.0 #22.0
 CATEGORIES =	geo devel
 
 HOMEPAGE =	http://www.gdal.org/
@@ -40,6 +40,7 @@ LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			devel/json-c \
 			graphics/png \
 			graphics/giflib \
+			graphics/libwebp \
 			graphics/jpeg \
 			graphics/jasper \
 			graphics/openjp2 \
@@ -49,7 +50,7 @@ LIB_DEPENDS-main =	${LIB_DEPENDS} \
 
 WANTLIB-main =		${WANTLIB} c expat m ${LIBCXX} z tiff openjp2 ssl crypto qhull \
 			curl pq geos geos_c png gif jpeg jasper json-c geotiff \
-			proj pthread freexl pcre spatialite sqlite3 xml2 lzma nghttp2
+			proj pthread freexl pcre spatialite sqlite3 xml2 lzma nghttp2 webp
 
 
 LIB_DEPENDS-python =	${PKGNAME}:${BASE_PKGPATH},-main
@@ -57,6 +58,10 @@ WANTLIB-python =	${MODPY_WANTLIB} gdal m pthread ${LIBCXX}
 
 LIB_DEPENDS-perl =	${PKGNAME}:${BASE_PKGPATH},-main
 WANTLIB-perl =		perl gdal # uses perl ABI
+WANTLIB-perl += c crypto curl expat freexl geos_c geotiff gif iconv
+WANTLIB-perl += jasper jpeg json-c lzma m nghttp2 openjp2 pcre png
+WANTLIB-perl += pq pthread qhull spatialite sqlite3 ssl tiff xml2 webp z
+
 
 RUN_DEPENDS +=		math/py-numpy
 BUILD_DEPENDS +=	${RUN_DEPENDS} devel/swig
diff --git a/geo/gdal/distinfo b/geo/gdal/distinfo
index 967ea463fd6..0011e684bed 100644
--- a/geo/gdal/distinfo
+++ b/geo/gdal/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gdal-2.1.3.tar.gz) = rmoKDcbrRamBpG2yfj3+FsZE/PBHMlV+LLMVd2l0B0o=
-SHA256 (gdalautotest-2.1.3.tar.gz) = se1OlzwTab06FXYafCDcBItAErZjVri05ZT5hN5zr5c=
-SIZE (gdal-2.1.3.tar.gz) = 12890278
-SIZE (gdalautotest-2.1.3.tar.gz) = 6016292
+SHA256 (gdal-2.2.0.tar.gz) = 0GVGpuNLd1ZlEqJVnpEXQCMg3ZSH3pqpXLijd4Fdw2A=
+SHA256 (gdalautotest-2.2.0.tar.gz) = 37auA7Z91B71mJmu3lT44knHXIzMuGJnHpkIQ/s2oPo=
+SIZE (gdal-2.2.0.tar.gz) = 13723728
+SIZE (gdalautotest-2.2.0.tar.gz) = 6769002
diff --git a/geo/gdal/patches/patch-apps_gdalserver_c b/geo/gdal/patches/patch-apps_gdalserver_c
index 12aa3acb2a6..d1b0d97d958 100644
--- a/geo/gdal/patches/patch-apps_gdalserver_c
+++ b/geo/gdal/patches/patch-apps_gdalserver_c
@@ -1,10 +1,11 @@
-$OpenBSD: patch-apps_gdalserver_c,v 1.2 2016/05/15 12:18:26 landry Exp $
+$OpenBSD: patch-apps_gdalserver_c,v 1.3 2017/05/19 09:19:48 landry Exp $
 
 Needed for fd_set/select
 
---- apps/gdalserver.c.orig	Mon Apr 25 19:35:51 2016
-+++ apps/gdalserver.c	Fri May 13 09:46:27 2016
-@@ -53,6 +53,7 @@
+Index: apps/gdalserver.c
+--- apps/gdalserver.c.orig
++++ apps/gdalserver.c
+@@ -52,6 +52,7 @@
    #include <sys/select.h>
    #include <sys/time.h>
    #include <sys/types.h>
diff --git a/geo/gdal/patches/patch-configure b/geo/gdal/patches/patch-configure
index e0579f1cced..353b30d4d1d 100644
--- a/geo/gdal/patches/patch-configure
+++ b/geo/gdal/patches/patch-configure
@@ -1,10 +1,11 @@
-$OpenBSD: patch-configure,v 1.15 2017/02/07 08:16:45 landry Exp $
+$OpenBSD: patch-configure,v 1.16 2017/05/19 09:19:48 landry Exp $
 
 chunk 1&2: adapt paths for our openjp2 install
 
---- configure.orig	Fri Jan 20 09:20:46 2017
-+++ configure	Mon Feb  6 11:22:35 2017
-@@ -23700,9 +23700,9 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -25130,9 +25130,9 @@ fi
          LIBS="-lopenjp2 $LIBS"
      fi
    else
@@ -16,7 +17,7 @@ chunk 1&2: adapt paths for our openjp2 install
  if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
-@@ -23766,7 +23766,7 @@ else
+@@ -25196,7 +25196,7 @@ else
    HAVE_OPENJPEG=yes
    if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then
      EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
diff --git a/geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp b/geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp
index b09fe9f420e..ad1ac86b2b5 100644
--- a/geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp
+++ b/geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp
@@ -1,8 +1,9 @@
-$OpenBSD: patch-frmts_openjpeg_openjpegdataset_cpp,v 1.5 2015/06/27 06:55:38 landry Exp $
---- frmts/openjpeg/openjpegdataset.cpp.orig	Sun Jun 14 21:06:32 2015
-+++ frmts/openjpeg/openjpegdataset.cpp	Thu Jun 25 22:59:28 2015
-@@ -31,7 +31,7 @@
- /* This file is to be used with openjpeg 2.0 */
+$OpenBSD: patch-frmts_openjpeg_openjpegdataset_cpp,v 1.6 2017/05/19 09:19:48 landry Exp $
+Index: frmts/openjpeg/openjpegdataset.cpp
+--- frmts/openjpeg/openjpegdataset.cpp.orig
++++ frmts/openjpeg/openjpegdataset.cpp
+@@ -35,7 +35,7 @@
+ #endif
  
  #if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
 -#include <openjpeg-2.1/openjpeg.h>
diff --git a/geo/gdal/patches/patch-port_cpl_port_h b/geo/gdal/patches/patch-port_cpl_port_h
new file mode 100644
index 00000000000..377f1a34502
--- /dev/null
+++ b/geo/gdal/patches/patch-port_cpl_port_h
@@ -0,0 +1,16 @@
+$OpenBSD: patch-port_cpl_port_h,v 1.1 2017/05/19 09:19:48 landry Exp $
+
+Fix isnan() not being defined
+
+Index: port/cpl_port.h
+--- port/cpl_port.h.orig
++++ port/cpl_port.h
+@@ -672,7 +672,7 @@ static inline int CPLIsFinite(double f) { return std::
+ #  define CPLIsFinite(x) __builtin_isfinite(x)
+ #else
+ /** Return whether a floating-pointer number is NaN */
+-#if defined(__cplusplus) && defined(__GNUC__) && defined(__linux) && !defined(__ANDROID__)
++#if defined(__cplusplus) && defined(__GNUC__) && defined(__OpenBSD__) && !defined(__ANDROID__)
+ /* so to not get warning about conversion from double to float with */
+ /* gcc -Wfloat-conversion when using isnan()/isinf() macros */
+ extern "C++" {
diff --git a/geo/gdal/patches/patch-swig_perl_GNUmakefile b/geo/gdal/patches/patch-swig_perl_GNUmakefile
index 6eb7674363f..5f12ccff295 100644
--- a/geo/gdal/patches/patch-swig_perl_GNUmakefile
+++ b/geo/gdal/patches/patch-swig_perl_GNUmakefile
@@ -1,8 +1,9 @@
-$OpenBSD: patch-swig_perl_GNUmakefile,v 1.3 2016/05/15 12:18:26 landry Exp $
+$OpenBSD: patch-swig_perl_GNUmakefile,v 1.4 2017/05/19 09:19:48 landry Exp $
 INST_PREFIX is wrong
---- swig/perl/GNUmakefile.orig	Mon Apr 25 19:35:57 2016
-+++ swig/perl/GNUmakefile	Fri May 13 09:46:29 2016
-@@ -28,7 +28,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
+Index: swig/perl/GNUmakefile
+--- swig/perl/GNUmakefile.orig
++++ swig/perl/GNUmakefile
+@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
  gdal_wrap.cc: generate
  
  Makefile_Geo__GDAL:
diff --git a/geo/gdal/patches/patch-swig_python_setup_py b/geo/gdal/patches/patch-swig_python_setup_py
index ae05476a662..bf0e107f0a0 100644
--- a/geo/gdal/patches/patch-swig_python_setup_py
+++ b/geo/gdal/patches/patch-swig_python_setup_py
@@ -1,7 +1,8 @@
-$OpenBSD: patch-swig_python_setup_py,v 1.7 2017/02/07 08:16:45 landry Exp $
---- swig/python/setup.py.orig	Fri Jan 20 09:20:59 2017
-+++ swig/python/setup.py	Mon Feb  6 11:22:35 2017
-@@ -210,7 +210,7 @@ class gdal_ext(build_ext):
+$OpenBSD: patch-swig_python_setup_py,v 1.8 2017/05/19 09:19:48 landry Exp $
+Index: swig/python/setup.py
+--- swig/python/setup.py.orig
++++ swig/python/setup.py
+@@ -216,7 +216,7 @@ class gdal_ext(build_ext):
          self.include_dirs.append(os.path.join(self.gdaldir,'include'))
  
  
diff --git a/geo/gdal/pkg/PLIST-main b/geo/gdal/pkg/PLIST-main
index c09ddcf9e2d..47f171038cc 100644
--- a/geo/gdal/pkg/PLIST-main
+++ b/geo/gdal/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.14 2016/05/15 12:18:26 landry Exp $
+@comment $OpenBSD: PLIST-main,v 1.15 2017/05/19 09:19:48 landry Exp $
 @conflict gdal-<=1.8.0
 @pkgpath geo/gdal
 bin/gdal-config
@@ -31,8 +31,10 @@ include/cpl_aws.h
 include/cpl_config.h
 include/cpl_config_extras.h
 include/cpl_conv.h
+include/cpl_cpu_features.h
 include/cpl_csv.h
 include/cpl_error.h
+include/cpl_google_cloud.h
 include/cpl_hash_set.h
 include/cpl_http.h
 include/cpl_list.h
@@ -45,6 +47,7 @@ include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_progress.h
 include/cpl_quad_tree.h
+include/cpl_sha1.h
 include/cpl_sha256.h
 include/cpl_spawn.h
 include/cpl_string.h
@@ -81,6 +84,9 @@ include/gdalpansharpen.h
 include/gdalsse_priv.h
 include/gdalwarper.h
 include/gdalwarpkernel_opencl.h
+include/gnm.h
+include/gnm_api.h
+include/gnmgraph.h
 include/gvgcpfit.h
 include/internal_qhull_headers.h
 include/memdataset.h
@@ -137,6 +143,7 @@ share/gdal/compdcs.csv
 share/gdal/coordinate_axis.csv
 share/gdal/cubewerx_extra.wkt
 share/gdal/datum_shift.csv
+share/gdal/default.rsc
 share/gdal/ecw_cs.wkt
 share/gdal/ellipsoid.csv
 share/gdal/epsg.wkt
@@ -150,6 +157,8 @@ share/gdal/gdalicon.png
 share/gdal/gdalvrt.xsd
 share/gdal/geoccs.csv
 share/gdal/gml_registry.xml
+share/gdal/gmlasconf.xml
+share/gdal/gmlasconf.xsd
 share/gdal/gt_datum.csv
 share/gdal/gt_ellips.csv
 share/gdal/header.dxf
@@ -157,6 +166,33 @@ share/gdal/inspire_cp_BasicPropertyUnit.gfs
 share/gdal/inspire_cp_CadastralBoundary.gfs
 share/gdal/inspire_cp_CadastralParcel.gfs
 share/gdal/inspire_cp_CadastralZoning.gfs
+share/gdal/jpfgdgml_AdmArea.gfs
+share/gdal/jpfgdgml_AdmBdry.gfs
+share/gdal/jpfgdgml_AdmPt.gfs
+share/gdal/jpfgdgml_BldA.gfs
+share/gdal/jpfgdgml_BldL.gfs
+share/gdal/jpfgdgml_Cntr.gfs
+share/gdal/jpfgdgml_CommBdry.gfs
+share/gdal/jpfgdgml_CommPt.gfs
+share/gdal/jpfgdgml_Cstline.gfs
+share/gdal/jpfgdgml_ElevPt.gfs
+share/gdal/jpfgdgml_GCP.gfs
+share/gdal/jpfgdgml_LeveeEdge.gfs
+share/gdal/jpfgdgml_RailCL.gfs
+share/gdal/jpfgdgml_RdASL.gfs
+share/gdal/jpfgdgml_RdArea.gfs
+share/gdal/jpfgdgml_RdCompt.gfs
+share/gdal/jpfgdgml_RdEdg.gfs
+share/gdal/jpfgdgml_RdMgtBdry.gfs
+share/gdal/jpfgdgml_RdSgmtA.gfs
+share/gdal/jpfgdgml_RvrMgtBdry.gfs
+share/gdal/jpfgdgml_SBAPt.gfs
+share/gdal/jpfgdgml_SBArea.gfs
+share/gdal/jpfgdgml_SBBdry.gfs
+share/gdal/jpfgdgml_WA.gfs
+share/gdal/jpfgdgml_WL.gfs
+share/gdal/jpfgdgml_WStrA.gfs
+share/gdal/jpfgdgml_WStrL.gfs
 share/gdal/netcdf_config.xsd
 share/gdal/nitf_spec.xml
 share/gdal/nitf_spec.xsd
@@ -168,6 +204,7 @@ share/gdal/pci_datum.txt
 share/gdal/pci_ellips.txt
 share/gdal/pcs.csv
 share/gdal/pcs.override.csv
+share/gdal/plscenesconf.json
 share/gdal/prime_meridian.csv
 share/gdal/projop_wparm.csv
 share/gdal/ruian_vf_ob_v1.gfs
@@ -176,12 +213,8 @@ share/gdal/ruian_vf_st_v1.gfs
 share/gdal/ruian_vf_v1.gfs
 share/gdal/s57agencies.csv
 share/gdal/s57attributes.csv
-share/gdal/s57attributes_aml.csv
-share/gdal/s57attributes_iw.csv
 share/gdal/s57expectedinput.csv
 share/gdal/s57objectclasses.csv
-share/gdal/s57objectclasses_aml.csv
-share/gdal/s57objectclasses_iw.csv
 share/gdal/seed_2d.dgn
 share/gdal/seed_3d.dgn
 share/gdal/stateplane.csv
diff --git a/geo/gdal/pkg/PLIST-python b/geo/gdal/pkg/PLIST-python
index c2138543741..6d116e54571 100644
--- a/geo/gdal/pkg/PLIST-python
+++ b/geo/gdal/pkg/PLIST-python
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-python,v 1.8 2016/05/15 12:18:26 landry Exp $
+@comment $OpenBSD: PLIST-python,v 1.9 2017/05/19 09:19:49 landry Exp $
 bin/epsg_tr.py
 bin/esri2wkt.py
 bin/gcps2vec.py
@@ -6,29 +6,22 @@ bin/gcps2wld.py
 bin/gdal2tiles.py
 bin/gdal2xyz.py
 bin/gdal_auth.py
-bin/gdal_calc.dox
 bin/gdal_calc.py
-bin/gdal_edit.dox
 bin/gdal_edit.py
-bin/gdal_fillnodata.dox
 bin/gdal_fillnodata.py
 bin/gdal_merge.py
 bin/gdal_pansharpen.py
-bin/gdal_polygonize.dox
 bin/gdal_polygonize.py
-bin/gdal_proximity.dox
 bin/gdal_proximity.py
 bin/gdal_retile.py
-bin/gdal_sieve.dox
 bin/gdal_sieve.py
 bin/gdalchksum.py
-bin/gdalcompare.dox
 bin/gdalcompare.py
 bin/gdalident.py
 bin/gdalimport.py
-bin/gdalmove.dox
 bin/gdalmove.py
 bin/mkgraticule.py
+bin/ogrmerge.py
 bin/pct2rgb.py
 bin/rgb2pct.py
 lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -83,5 +76,6 @@ lib/python${MODPY_VERSION}/site-packages/osr.pyc
 @man man/man1/gdal_sieve.1
 @man man/man1/gdalcompare.1
 @man man/man1/gdalmove.1
+@man man/man1/ogrmerge.1
 @man man/man1/pct2rgb.1
 @man man/man1/rgb2pct.1