diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index b913935f679e..3d21d80edb09 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,93 +1,94 @@
 PORTNAME=	gerbera
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.0
-PORTREVISION=	1
+DISTVERSION=	1.8.0
 CATEGORIES=	net multimedia
 
 MAINTAINER=	daniel.engberg.lists@pyret.net
 COMMENT=	Media server compatible with DLNA and UPnP
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog \
 		libpugixml.so:textproc/pugixml \
 		libinotify.so:devel/libinotify
 
 USES=		cmake compiler:c++17-lang iconv localbase:ldflags \
 		pkgconfig sqlite
 
 USE_GITHUB=	yes
 USE_RC_SUBR=	gerbera
 
+CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
+
 TEST_TARGET=	test
 
-CMAKE_OFF=	WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
+SUB_FILES=	pkg-message
+SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
 
 USERS=		gerbera
 GROUPS=		gerbera
-SUB_LIST=	USER=${USERS} GROUP=${GROUPS}
+
 PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
-SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		CURL DEBUG DUKTAPE EXIV2 FFMPEG FFMPEGTHUMBNAILER \
 			LIBMAGIC MATROSKA TAGLIB TEST
 OPTIONS_DEFAULT=	CURL DUKTAPE EXIV2 FFMPEG LIBMAGIC TAGLIB LIBNPUPNP
 
 OPTIONS_SINGLE=		UPNPLIB
 OPTIONS_SINGLE_UPNPLIB=	LIBNPUPNP LIBUPNP
 
 CURL_DESC=		Support for online services via cURL
 DUKTAPE_DESC=		Javascript support for custom import scripts
 FFMPEGTHUMBNAILER_DESC=	Support for thumbnail generation
-LIBNPUPNP_DESC=		Use high performance libnpupnp library
 LIBMAGIC_DESC=		Identify file mime types via libmagic
+LIBNPUPNP_DESC=		Use high performance libnpupnp library
 LIBUPNP_DESC=		Use libupnp library
 MATROSKA_DESC=		Extract video/mkv metadata via libmatroska
 TAGLIB_DESC=		Extract audio file metadata via taglib
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	WITH_CURL
 
 DEBUG_CMAKE_BOOL=	WITH_DEBUG
 
 DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
 DUKTAPE_CMAKE_BOOL=	WITH_JS
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CMAKE_BOOL=	WITH_EXIV2
 
+FFMPEGTHUMBNAILER_IMPLIES=	FFMPEG
+FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
+FFMPEGTHUMBNAILER_CMAKE_BOOL=	WITH_FFMPEGTHUMBNAILER
+
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_AVCODEC
 
-FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
-FFMPEGTHUMBNAILER_CMAKE_BOOL=	WITH_FFMPEGTHUMBNAILER
-FFMPEGTHUMBNAILER_IMPLIES=	FFMPEG
-
 LIBMAGIC_LIB_DEPENDS=	libmagic.so:sysutils/file
 LIBMAGIC_CMAKE_BOOL=	WITH_MAGIC
 
 LIBNPUPNP_LIB_DEPENDS=	libnpupnp.so:net/libnpupnp
 LIBNPUPNP_CMAKE_BOOL=	WITH_NPUPNP
 
 LIBUPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 
 MATROSKA_LIB_DEPENDS=	libmatroska.so:multimedia/libmatroska
 MATROSKA_CMAKE_BOOL=	WITH_MATROSKA
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	WITH_TAGLIB
 
+TEST_IMPLIES=		CURL DUKTAPE
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_CMAKE_BOOL=	WITH_TESTS
-TEST_IMPLIES=		CURL DUKTAPE
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera
 	@${MKDIR} ${STAGEDIR}/var/db/gerbera
 	@${MKDIR} ${STAGEDIR}/var/log/gerbera
 	@${STAGEDIR}${PREFIX}/bin/gerbera -f /var/db/gerbera --create-config > ${STAGEDIR}${PREFIX}/etc/gerbera-config.xml.sample
 
 .include <bsd.port.mk>
diff --git a/net/gerbera/distinfo b/net/gerbera/distinfo
index 5bb0e5d6c42a..6ad7c07c4727 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615151826
-SHA256 (gerbera-gerbera-v1.7.0_GH0.tar.gz) = 6d40b840d015ba5c512f41442957c1c0fdbba07c18724cf00a45e0a579ddeb7f
-SIZE (gerbera-gerbera-v1.7.0_GH0.tar.gz) = 3574471
+TIMESTAMP = 1617997649
+SHA256 (gerbera-gerbera-v1.8.0_GH0.tar.gz) = 02044abd1363c5f5604c5830e560b102ac456179afbf3be60e65847f47f4c599
+SIZE (gerbera-gerbera-v1.8.0_GH0.tar.gz) = 3579194