diff --git a/editors/deforaos-editor/Makefile b/editors/deforaos-editor/Makefile
index 204df93a74b7..7a29cee95e23 100644
--- a/editors/deforaos-editor/Makefile
+++ b/editors/deforaos-editor/Makefile
@@ -1,50 +1,47 @@
 PORTNAME=	editor
-PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTVERSION=	0.4.1
 CATEGORIES=	editors
-MASTER_SITES=	http://www.defora.org/os/download/download/4398/
+MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Editor/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Editor-${PORTVERSION}
 
 MAINTAINER=	khorben@defora.org
 COMMENT=	DeforaOS desktop text editor
 WWW=		https://www.defora.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
-		libDesktop.so:x11/deforaos-libdesktop \
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+		libfreetype.so:print/freetype2 \
+		libSystem.so:devel/deforaos-libsystem
+
+USES=		desktop-file-utils gnome pkgconfig xorg
+USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_XORG=	x11
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${PREFIX}/share/man
 
-USES=		desktop-file-utils gnome pkgconfig
-USE_GNOME=	gtk20 cairo gdkpixbuf2
-
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
+
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
+
 NLS_USES=	gettext
-DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|data doc po|data po|' \
 		${WRKSRC}/Makefile
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} 's|po src tools|src tools|' \
 		${WRKSRC}/Makefile
 
-post-patch:
-	@${REINPLACE_CMD} 's|-Wl,-pie||g' \
-		${WRKSRC}/tools/Makefile \
-		${WRKSRC}/src/Makefile
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/editor \
 		${STAGEDIR}${PREFIX}/bin/filter
 
 .include <bsd.port.mk>
diff --git a/editors/deforaos-editor/distinfo b/editors/deforaos-editor/distinfo
index faace885bbc6..d97bbc79fd2d 100644
--- a/editors/deforaos-editor/distinfo
+++ b/editors/deforaos-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484322291
-SHA256 (Editor-0.4.0.tar.gz) = 6d74ef9880c3dacd9beb25c622db23f1814d7f629ddd0ca15abac2db49e0536c
-SIZE (Editor-0.4.0.tar.gz) = 25363
+TIMESTAMP = 1728602693
+SHA256 (Editor-0.4.1.tar.gz) = 89b3f5e73d7895ea16ca71264bf84630daa0557c7b3eb249be4a5c8a893d06cc
+SIZE (Editor-0.4.1.tar.gz) = 27423
diff --git a/editors/deforaos-editor/files/patch-doc_Makefile b/editors/deforaos-editor/files/patch-doc_Makefile
index bce0ae3c984d..c7b6394451ca 100644
--- a/editors/deforaos-editor/files/patch-doc_Makefile
+++ b/editors/deforaos-editor/files/patch-doc_Makefile
@@ -1,32 +1,23 @@
---- doc/Makefile.orig	2017-01-13 15:29:31 UTC
+--- doc/Makefile.orig	2020-01-11 07:37:41 UTC
 +++ doc/Makefile
 @@ -1,4 +1,4 @@
--TARGETS	= $(OBJDIR)editor.1 $(OBJDIR)editor.html $(OBJDIR)filter.1 $(OBJDIR)filter.html
-+TARGETS	= $(OBJDIR)editor.1 $(OBJDIR)filter.1
+-TARGETS	= $(OBJDIR)editor.1 $(OBJDIR)editor.html $(OBJDIR)editor.xml $(OBJDIR)filter.1 $(OBJDIR)filter.html $(OBJDIR)filter.xml
++TARGETS	= $(OBJDIR)editor.1 $(OBJDIR)editor.xml $(OBJDIR)filter.1 $(OBJDIR)filter.xml
  OBJDIR	=
  PREFIX	= /usr/local
  DESTDIR	=
-@@ -25,23 +25,17 @@ $(OBJDIR)filter.html: filter.css.xml fil
- clean:
- 	$(RM) -- $(editor.1_OBJS) $(editor.html_OBJS) $(filter.1_OBJS) $(filter.html_OBJS)
- 	./docbook.sh -c -P "$(PREFIX)" -- "editor.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "editor.html"
- 	./docbook.sh -c -P "$(PREFIX)" -- "filter.1"
--	./docbook.sh -c -P "$(PREFIX)" -- "filter.html"
+@@ -41,14 +41,10 @@ install: all
  
- distclean: clean
- 	$(RM) -- $(TARGETS)
- 
- install: $(TARGETS)
+ install: all
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)editor.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)editor.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)filter.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)filter.html"
  
  uninstall:
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "editor.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "filter.html"
  
  .PHONY: all clean distclean install uninstall
diff --git a/editors/deforaos-editor/pkg-descr b/editors/deforaos-editor/pkg-descr
index 538d344f8c24..80964a8db802 100644
--- a/editors/deforaos-editor/pkg-descr
+++ b/editors/deforaos-editor/pkg-descr
@@ -1 +1,3 @@
-DeforaOS desktop text editor
+DeforaOS Desktop text editor
+
+Editor is a simple text editor, part of the DeforaOS Project.