diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index 3bd536d0c443..a6f5fb2fa224 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	keyboard
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4453/
+MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Keyboard/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Keyboard-${PORTVERSION}
 
 MAINTAINER=	khorben@defora.org
 COMMENT=	DeforaOS desktop virtual keyboard
 WWW=		https://www.defora.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop \
 		libSystem.so:devel/deforaos-libsystem \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		desktop-file-utils gnome pkgconfig xorg
-USE_GNOME=	gtk20 cairo gdkpixbuf2
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11 xtst
+
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
 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
 
+NLS_USES=	gettext
+
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|data doc include|data include|' \
 	${WRKSRC}/Makefile
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} 's|include po src|include src|' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/keyboardctl \
 		${STAGEDIR}${PREFIX}/bin/keyboard \
 		${STAGEDIR}${PREFIX}/lib/Desktop/widget/keyboard.so
 
 .include <bsd.port.mk>
diff --git a/x11/deforaos-keyboard/distinfo b/x11/deforaos-keyboard/distinfo
index b2383e75b169..6aae8bbd89af 100644
--- a/x11/deforaos-keyboard/distinfo
+++ b/x11/deforaos-keyboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475616754
-SHA256 (Keyboard-0.3.1.tar.gz) = 259dfdaf09d5450b9f5406eaea68c1f42f762edccb8c5bfbbfc2f6dd905fa045
-SIZE (Keyboard-0.3.1.tar.gz) = 20251
+TIMESTAMP = 1728602219
+SHA256 (Keyboard-0.4.0.tar.gz) = e5f08da035fd544e10fecc3057c3e0ee31540e200c4bc40eb8afeb68a0f728d9
+SIZE (Keyboard-0.4.0.tar.gz) = 22643
diff --git a/x11/deforaos-keyboard/pkg-descr b/x11/deforaos-keyboard/pkg-descr
index d68af5c830b9..e8b25bf0786e 100644
--- a/x11/deforaos-keyboard/pkg-descr
+++ b/x11/deforaos-keyboard/pkg-descr
@@ -1 +1,8 @@
-DeforaOS desktop virtual keyboard
+This program emulates a physical keyboard by providing a virtual interface on
+screen. It currently supports four modes:
+ * docked, where it will occupy the bottom of the screen;
+ * popup, likewise as a popup window;
+ * windowed, where it can be found in the system tray (the default)
+ * embedded, which outputs its window ID for inclusion within another program.
+
+Additionally, it can be piloted through its companion tool, desktopctl(1).