diff --git a/x11/Makefile b/x11/Makefile
index 8978ab7bc0bd..006d04bdaf3c 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -366,6 +366,7 @@
     SUBDIR += wmctrl
     SUBDIR += wmdrawer
     SUBDIR += wmmatrix
+    SUBDIR += wmsystemtray
     SUBDIR += wmutils-core
     SUBDIR += wmutils-opt
     SUBDIR += wmxss
diff --git a/x11/wmsystemtray/Makefile b/x11/wmsystemtray/Makefile
new file mode 100644
index 000000000000..b75a8c596164
--- /dev/null
+++ b/x11/wmsystemtray/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	wmsystemtray
+PORTVERSION=	1.4
+CATEGORIES=	x11 windowmaker afterstep
+MASTER_SITES=	SF/wmsystemtray/wmsystemtray
+
+MAINTAINER=	iluxa@ex.ua
+COMMENT=	System tray dockapp that uses freedesktop.org system tray protocol
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		pkgconfig
+USE_XORG=	ice sm x11 xext xfixes xmu xpm
+
+GNU_CONFIGURE=	yes
+PLIST_FILES=	bin/wmsystemtray man/man1/wmsystemtray.1.gz
+
+.include <bsd.port.mk>
diff --git a/x11/wmsystemtray/distinfo b/x11/wmsystemtray/distinfo
new file mode 100644
index 000000000000..89a73c9abcfb
--- /dev/null
+++ b/x11/wmsystemtray/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1529072371
+SHA256 (wmsystemtray-1.4.tar.gz) = 8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9
+SIZE (wmsystemtray-1.4.tar.gz) = 131973
diff --git a/x11/wmsystemtray/pkg-descr b/x11/wmsystemtray/pkg-descr
new file mode 100644
index 000000000000..2d4563923a56
--- /dev/null
+++ b/x11/wmsystemtray/pkg-descr
@@ -0,0 +1,5 @@
+wmsystemtray is a system tray dockapp using freedesktop.org system
+tray protocol.  It is designed to work with WindowMaker or another
+WM, that supports dock applications (FVWM, AfterStep).
+
+WWW: https://wmsystemtray.sourceforge.io
diff --git a/x11/wmsystemtray/pkg-message b/x11/wmsystemtray/pkg-message
new file mode 100644
index 000000000000..2af864fd137c
--- /dev/null
+++ b/x11/wmsystemtray/pkg-message
@@ -0,0 +1 @@
+To use wmsystemtray outside of WindowMaker WM, use --non-wmaker flag.