diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index aef7f162489d..808e22956b42 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,78 +1,80 @@
 PORTNAME=	netsurf
 PORTVERSION=	3.11
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Lightweight web browser
 WWW=		https://www.netsurf-browser.org/
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	duk:lang/duktape \
 		nsgenbind:devel/nsgenbind \
 		p5-HTML-Parser>=3.72:www/p5-HTML-Parser \
-		xxd:editors/vim
+		xxd:sysutils/xxd
 LIB_DEPENDS=	libcss.so:textproc/libcss \
 		libcurl.so:ftp/curl \
 		libdom.so:www/libdom \
 		libexpat.so:textproc/expat2 \
 		libhubbub.so:www/libhubbub \
 		libnsbmp.so:graphics/libnsbmp \
 		libnsgif.so:graphics/libnsgif \
 		libnspsl.so:dns/libnspsl \
 		libnsutils.so:devel/libnsutils \
 		libparserutils.so:devel/libparserutils \
 		libpng.so:graphics/png \
 		libutf8proc.so:textproc/utf8proc \
 		libwapcaplet.so:textproc/libwapcaplet \
 		libwebp.so:graphics/webp
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		duk:lang/duktape
 
 USES=		bison cpe desktop-file-utils gmake gnome iconv:translit jpeg \
 		localbase pkgconfig shebangfix ssl
 CPE_VENDOR=	${PORTNAME}-browser
 USE_GNOME=	cairo glib20 gtk30 librsvg2
 
 MAKE_ARGS=	CC="${CC}" \
 		CCOPT="" \
 		HOST="${OPSYS}" \
 		HOST_CC="${CC}" \
 		OPTCFLAGS="${CFLAGS}" \
 		Q="" \
 		TARGET="gtk3" \
 		WARNFLAGS=""
 .if defined(WITH_DEBUG)
 MAKE_ARGS+=	STRIP="true"
 .endif
 MAKE_ENV+=	COMPONENT_TYPE="lib-shared" \
 		FLEX="${LOCALBASE}/bin/flex"
 
 ALL_TARGET=	#empty
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB} -lssl -lcrypto
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 post-patch:
 	@${REINPLACE_CMD} '/CFLAGS/d' \
 		${WRKSRC}//Makefile.defaults
 	@${CP} ${FILESDIR}/buildui.pl ${WRKSRC}/utils/
 
 do-configure:
 	@${CP} ${FILESDIR}/Makefile.config  ${WRKSRC}
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf netsurf-gtk3 \
 		netsurf-gtk
 .for d in applications pixmaps
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/${d}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/www/netsurf/files/patch-frontends_gtk_resources.c b/www/netsurf/files/patch-frontends_gtk_resources.c
deleted file mode 100644
index dc812f85081a..000000000000
--- a/www/netsurf/files/patch-frontends_gtk_resources.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- frontends/gtk/resources.c.orig	2021-04-01 19:00:43 UTC
-+++ frontends/gtk/resources.c
-@@ -82,6 +82,11 @@ static struct nsgtk_resource_s ui_resource[] = {
- 	RES_ENTRY("globalhistory"),
- 	RES_ENTRY("localhistory"),
- 	RES_ENTRY("options"),
-+	RES_ENTRY("deoptions"),
-+	RES_ENTRY("enoptions"),
-+	RES_ENTRY("froptions"),
-+	RES_ENTRY("itoptions"),
-+	RES_ENTRY("nloptions"),
- 	RES_ENTRY("hotlist"),
- 	RES_ENTRY("cookies"),
- 	RES_ENTRY("viewdata"),
-@@ -552,6 +557,7 @@ nsgtk_builder_new_from_resname(const char *resname, Gt
- 			      error->message);
- 			g_error_free(error);
- 			g_object_unref(G_OBJECT(new_builder));
-+			
- 			return NSERROR_INIT_FAILED;
- 		}
- 	} else {