diff -urN qgis.orig/Makefile qgis/Makefile
--- qgis.orig/Makefile	2015-03-01 08:19:38.291807000 +0100
+++ qgis/Makefile	2015-04-19 08:24:52.167936000 +0200
@@ -3,7 +3,9 @@
 
 PORTNAME=	qgis
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics geography
+DISTNAME=	qgis-${GH_TAGNAME}
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	Geographical Information System (GIS) data viewer
@@ -21,12 +23,11 @@
 		libspatialindex.so:${PORTSDIR}/devel/spatialindex \
 		libspatialite.so:${PORTSDIR}/databases/spatialite
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-QGIS-${GH_COMMIT}
+WRKSRC=	${WRKDIR}/QGIS-${GH_TAGNAME}
 
-USE_GITHUB=
-GH_ACCOUNT=	qgis
-GH_COMMIT=	ddccf8e
-GH_TAGNAME=	${GH_COMMIT}
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME}
+GH_TAGNAME=	ddccf8e
 
 USES=		bison cmake fortran gmake python
 USE_SQLITE=	yes
@@ -35,8 +36,9 @@
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		GRASS POSTGIS PYTHON MAPSERVER
+OPTIONS_DEFINE=		GRASS POSTGIS PYTHON SERVER
 OPTIONS_DEFAULT=	POSTGIS PYTHON
+SERVER_DESC=	Enable QGIS server
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
@@ -78,13 +80,13 @@
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMAPSERVER}
-CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=TRUE
-PLIST_SUB+=	QGIS_MAPSERVER=""
+.if ${PORT_OPTIONS:MSERVER}
+CMAKE_ARGS+=	-DWITH_SERVER:BOOL=TRUE
+PLIST_SUB+=	QGIS_SERVER=""
 LIB_DEPENDS+=	libfcgi.so:${PORTSDIR}/www/fcgi
 .else
-CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=FALSE
-PLIST_SUB+=	QGIS_MAPSERVER="@comment "
+CMAKE_ARGS+=	-DWITH_SERVER:BOOL=FALSE
+PLIST_SUB+=	QGIS_SERVER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
diff -urN qgis.orig/distinfo qgis/distinfo
--- qgis.orig/distinfo	2015-03-01 08:19:38.292077000 +0100
+++ qgis/distinfo	2015-04-19 08:06:22.436329000 +0200
@@ -1,2 +1,2 @@
-SHA256 (qgis-2.8.1.tar.gz) = 44874d8b55e473d21c7f70e0f20baa8dfc8b05c1a8b4c735e97ed4c53c801b63
-SIZE (qgis-2.8.1.tar.gz) = 69488815
+SHA256 (qgis-ddccf8e_GH0.tar.gz) = aef5cddedb7f8a412b831ad7ed877cc9ce8d61cb4c17bcd49db5a3a73a840ccb
+SIZE (qgis-ddccf8e_GH0.tar.gz) = 69487659
diff -urN qgis.orig/pkg-plist qgis/pkg-plist
--- qgis.orig/pkg-plist	2015-03-01 08:19:38.291135000 +0100
+++ qgis/pkg-plist	2015-04-19 07:57:28.795740000 +0200
@@ -1,6 +1,10 @@
+%%QGIS_SERVER%%bin/admin.sld
 bin/qbrowser
 bin/qgis
 bin/qgis_bench
+%%QGIS_SERVER%%bin/qgis_mapserv.fcgi
+%%QGIS_SERVER%%bin/schemaExtension.xsd
+%%QGIS_SERVER%%bin/wms_metadata.xml
 include/qgis/Bezier3D.h
 include/qgis/CloughTocherInterpolator.h
 include/qgis/DualEdgeTriangulation.h
@@ -537,6 +541,8 @@
 lib/libqgis_gui.so.2.8.1
 lib/libqgis_networkanalysis.so
 lib/libqgis_networkanalysis.so.2.8.1
+%%QGIS_SERVER%%lib/libqgis_server.so
+%%QGIS_SERVER%%lib/libqgis_server.so.2.8.1
 %%GRASS%%lib/libqgisgrass.so
 %%GRASS%%lib/libqgisgrass.so.2.8.1
 %%QGIS_PYTHON%%lib/libqgispython.so
@@ -4232,11 +4238,13 @@
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_core.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_gui.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_networkanalysis.so
+%%QGIS_SERVER%%%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/_server.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/analysis/__init__.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/core/__init__.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/core/contextmanagers.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/gui/__init__.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/networkanalysis/__init__.py
+%%QGIS_SERVER%%%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/server/__init__.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/user.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/utils.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qsci_apis/OSGeo_GDAL-OGR-1.10.0.api