diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 6676f7b770d2..a8d2e0e97f2a 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -1,56 +1,51 @@
 PORTNAME=	deforaos-browser
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.5.5
 CATEGORIES=	x11-fm
-MASTER_SITES=	http://www.defora.org/os/download/download/4442/
+MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Browser/
 DISTNAME=	Browser-${PORTVERSION}
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	DeforaOS desktop file browser
 WWW=		https://www.defora.org/
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
 		libDesktop.so:x11/deforaos-libdesktop \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libXrandr.so:x11/libXrandr
 
+USES=		gnome pkgconfig xorg desktop-file-utils
+
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=		gettext
 DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
     ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
-USES=		desktop-file-utils gnome pkgconfig xorg
-USE_GNOME=	gtk20 cairo
+USE_GNOME=	gtk30 cairo gdkpixbuf2
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
 CONFLICTS_INSTALL=	schilyutils silo # bin/browser bin/copy
 post-patch:
 	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
 		${WRKSRC}/data/pkgconfig.sh
-	${REINPLACE_CMD} 's|-Wl,-pie||g' \
-		${WRKSRC}/tests/Makefile \
-		${WRKSRC}/tools/Makefile \
-		${WRKSRC}/src/Makefile
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} 's|include po src|include src|' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
 		${STAGEDIR}${PREFIX}/lib/Desktop/widget/browser.so \
 		${STAGEDIR}${PREFIX}/lib/Browser/plugins/* \
 		${STAGEDIR}${PREFIX}/lib/libBrowser.so.0.0
 
 .include <bsd.port.mk>
diff --git a/x11-fm/deforaos-browser/distinfo b/x11-fm/deforaos-browser/distinfo
index febb7babcd49..464a1848385b 100644
--- a/x11-fm/deforaos-browser/distinfo
+++ b/x11-fm/deforaos-browser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475616938
-SHA256 (Browser-0.5.1.tar.gz) = d2560e0ac7f97f12055e758cb82f861d9661dd8757e4790c40c1a904c0cbf41a
-SIZE (Browser-0.5.1.tar.gz) = 155403
+TIMESTAMP = 1696878459
+SHA256 (Browser-0.5.5.tar.gz) = 747ef80b027794a42e77a96686ea1fd20b89024f3d677eff2076a50e5db733d8
+SIZE (Browser-0.5.5.tar.gz) = 174164
diff --git a/x11-fm/deforaos-browser/files/patch-doc_Makefile b/x11-fm/deforaos-browser/files/patch-doc_Makefile
index 9d8d0fe63c4f..b575b9d8f00a 100644
--- a/x11-fm/deforaos-browser/files/patch-doc_Makefile
+++ b/x11-fm/deforaos-browser/files/patch-doc_Makefile
@@ -1,51 +1,35 @@
---- doc/Makefile.orig	2016-10-05 08:10:40 UTC
+--- doc/Makefile.orig	2023-11-20 18:15:16 UTC
 +++ doc/Makefile
-@@ -1,4 +1,4 @@
--TARGETS	= $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml
-+TARGETS	= $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml
+@@ -1,5 +1,5 @@ SUBDIRS	= gtkdoc
+ SUBDIRS	= gtkdoc
+-TARGETS	= $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)desktopctl.xml $(OBJDIR)gtkdoc/Browser.types $(OBJDIR)gtkdoc/html.stamp $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)open.xml $(OBJDIR)pinentry-sudo-askpass $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.html $(OBJDIR)view.xml $(OBJDIR)zenity-sudo-askpass
++TARGETS	= $(OBJDIR)browser.1 $(OBJDIR)browser.xml $(OBJDIR)copy.1 $(OBJDIR)copy.xml $(OBJDIR)delete.1 $(OBJDIR)delete.xml $(OBJDIR)desktop.1 $(OBJDIR)desktop.xml $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.xml $(OBJDIR)gtkdoc/Browser.types $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)move.1 $(OBJDIR)move.xml $(OBJDIR)open.1 $(OBJDIR)open.xml $(OBJDIR)pinentry-sudo-askpass $(OBJDIR)properties.1 $(OBJDIR)properties.xml $(OBJDIR)view.1 $(OBJDIR)view.xml $(OBJDIR)zenity-sudo-askpass
  OBJDIR	=
  PREFIX	= /usr/local
  DESTDIR	=
-@@ -126,42 +126,24 @@ distclean: clean
- 
- install: $(TARGETS)
+@@ -202,25 +202,15 @@ install: all
+ 		$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
+ 		else $(MAKE) install; fi) || exit; done
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)delete.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)delete.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.html"
+-	./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.html"
+ 	../tools/subst.sh -P "$(DESTDIR)$(PREFIX)/share/doc/Browser" -i -- "$(OBJDIR)pinentry-sudo-askpass"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.html"
  	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.1"
 -	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.html"
+ 	../tools/subst.sh -P "$(DESTDIR)$(PREFIX)/share/doc/Browser" -i -- "$(OBJDIR)zenity-sudo-askpass"
  
  uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "copy.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "delete.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktop.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "desktopctl.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "move.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "open.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "properties.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "view.html"
- 
- .PHONY: all clean distclean install uninstall
diff --git a/x11-fm/deforaos-browser/pkg-descr b/x11-fm/deforaos-browser/pkg-descr
index 9cd0684da1f9..6d4f839740ba 100644
--- a/x11-fm/deforaos-browser/pkg-descr
+++ b/x11-fm/deforaos-browser/pkg-descr
@@ -1 +1 @@
-DeforaOS desktop browser
+DeforaOS desktop file manager and desktop handler
diff --git a/x11-fm/deforaos-browser/pkg-plist b/x11-fm/deforaos-browser/pkg-plist
index 9a04e8d4aab5..cda105b35d8d 100644
--- a/x11-fm/deforaos-browser/pkg-plist
+++ b/x11-fm/deforaos-browser/pkg-plist
@@ -1,49 +1,55 @@
 bin/browser
 bin/copy
 bin/delete
 bin/desktop
 bin/desktopctl
 bin/move
 bin/open
 bin/properties
 bin/view
 include/Desktop/Browser.h
 include/Desktop/Browser/desktop.h
 include/Desktop/Browser/plugin.h
 include/Desktop/Browser/vfs.h
 lib/Browser/plugins/cvs.so
 lib/Browser/plugins/dirtree.so
 lib/Browser/plugins/favorites.so
 lib/Browser/plugins/git.so
 lib/Browser/plugins/make.so
 lib/Browser/plugins/places.so
 lib/Browser/plugins/preview.so
 lib/Browser/plugins/properties.so
 lib/Browser/plugins/selection.so
 lib/Browser/plugins/subversion.so
 lib/Browser/plugins/trash.so
 lib/Browser/plugins/volumes.so
 lib/Desktop/widget/browser.so
 lib/libBrowser.a
 lib/libBrowser.so
 lib/libBrowser.so.0
 lib/libBrowser.so.0.0
 libdata/pkgconfig/Browser.pc
+%%PORTDOCS%%share/doc/Browser/COPYING
+%%PORTDOCS%%share/doc/Browser/README.md
+%%PORTDOCS%%share/doc/Browser/pinentry-sudo-askpass
+%%PORTDOCS%%share/doc/Browser/zenity-sudo-askpass
 %%PORTDOCS%%man/man1/browser.1.gz
 %%PORTDOCS%%man/man1/copy.1.gz
 %%PORTDOCS%%man/man1/delete.1.gz
 %%PORTDOCS%%man/man1/desktop.1.gz
 %%PORTDOCS%%man/man1/desktopctl.1.gz
 %%PORTDOCS%%man/man1/move.1.gz
 %%PORTDOCS%%man/man1/open.1.gz
 %%PORTDOCS%%man/man1/properties.1.gz
 %%PORTDOCS%%man/man1/view.1.gz
-share/applications/deforaos-browser.desktop
-share/applications/deforaos-desktop-settings.desktop
+share/applications/org.defora.browser.desktop
+share/applications/org.defora.browser-folder.desktop
+share/applications/org.defora.desktop-settings.desktop
+share/applications/org.defora.view.desktop
 share/icons/hicolor/16x16/apps/browser-view-details.png
 share/icons/hicolor/16x16/apps/browser-view-icons.png
 share/icons/hicolor/16x16/apps/browser-view-list.png
 %%NLS%%share/locale/de/LC_MESSAGES/Browser.mo
 %%NLS%%share/locale/es/LC_MESSAGES/Browser.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/Browser.mo
 %%NLS%%share/locale/it/LC_MESSAGES/Browser.mo