diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index fa689fef59d6..61569b74c1db 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.8.2
+PORTVERSION=	2.8.3
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index a9183dbb3fdc..1e4a80b8a10e 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geoserver-2.8.2-bin.zip) = 4d7bc918ace166b363700f3ac17894d184bc6e765de5b7370a228f333555b263
-SIZE (geoserver-2.8.2-bin.zip) = 64773300
+SHA256 (geoserver-2.8.3-bin.zip) = 1f5c970d665864c9e25a40d10a9fc22e1a0970cd669f970b0dde48b680a09b96
+SIZE (geoserver-2.8.3-bin.zip) = 64800398
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 344337636554..6b5c0efa14b3 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -571,59 +571,59 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-web-wms-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wms-%%MVER%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-data-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-graph-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-14.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-data-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-graph-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-14.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/guava-17.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-1.8.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-1.8.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-jdbc-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-georss-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-gmaps-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-kml-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-rest-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-tms-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-ve-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wms-1.8.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gwc-wmts-1.8.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.3.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/htmlvalidator-1.2.jar
@@ -685,23 +685,23 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/jts-1.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.14.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-14.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-14.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-14.3.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-14.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.json-2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.freemarker-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.json-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.spring-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.simpleframework-3.1.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-14.2.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-14.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/picocontainer-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/pngj-2.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-9.4-1201-jdbc41.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/servlet-api-2.5.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-api-1.6.1.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-log4j12-1.7.10.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-api-1.6.4.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/slf4j-log4j12-1.6.4.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-aop-3.1.4.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-asm-3.1.4.RELEASE.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/spring-beans-3.1.4.RELEASE.jar