diff --git a/x11/tabbed/Makefile b/x11/tabbed/Makefile
index be06d5f9b8a2..dbfba975dcfb 100644
--- a/x11/tabbed/Makefile
+++ b/x11/tabbed/Makefile
@@ -1,37 +1,40 @@
 PORTNAME=	tabbed
-PORTVERSION=	0.6
-PORTREVISION=	1
+DISTVERSION=	0.8
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/tools/
 
 MAINTAINER=	mp39590@gmail.com
 COMMENT=	Tabbed frontend to Xembed-aware applications
 WWW=		https://tools.suckless.org/tabbed
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		xorg
-USE_XORG=	x11
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 
-OPTIONS_DEFINE=	DOCS
+USES=		localbase:ldflags pkgconfig xorg
+USE_XORG=	x11 xft xorgproto
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}"
 
 PLIST_FILES=	bin/tabbed \
-		share/man/man1/tabbed.1.gz
-PORTDOCS=	LICENSE README
-MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}"
+		bin/xembed \
+		share/man/man1/tabbed.1.gz \
+		share/man/man1/xembed.1.gz
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
 
 pre-everything::
 	@${ECHO_MSG} "You can build tabbed with your own config.h using the TABBED_CONF knob:"
 	@${ECHO_MSG} "make TABBED_CONF=/path/to/tabbed/config.h install clean"
 
 post-extract:
 .if defined(TABBED_CONF)
 	@${ECHO_MSG} "creating config.h from ${TABBED_CONF}"
 	@${CP} ${TABBED_CONF} ${WRKSRC}/config.h
 .endif
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/x11/tabbed/distinfo b/x11/tabbed/distinfo
index 8af115909d34..fa01beec6a60 100644
--- a/x11/tabbed/distinfo
+++ b/x11/tabbed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tabbed-0.6.tar.gz) = 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42
-SIZE (tabbed-0.6.tar.gz) = 12926
+TIMESTAMP = 1730835184
+SHA256 (tabbed-0.8.tar.gz) = 95bdffccb071083068d2b555c2524e9c7c57c9b64494d46c697e678d49a0a3d7
+SIZE (tabbed-0.8.tar.gz) = 13970
diff --git a/x11/tabbed/files/patch-Makefile b/x11/tabbed/files/patch-Makefile
new file mode 100644
index 000000000000..4a2144cf9161
--- /dev/null
+++ b/x11/tabbed/files/patch-Makefile
@@ -0,0 +1,12 @@
+--- Makefile.orig	2024-11-06 06:26:09 UTC
++++ Makefile
+@@ -9,7 +9,8 @@ DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+ DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+ 
+ # use system flags.
+-TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CFLAGS}
++FREETYPE_CFLAGS!=pkg-config --cflags freetype2
++TABBED_CFLAGS = -I/usr/X11R6/include ${FREETYPE_CFLAGS} ${CFLAGS}
+ TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
+ TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700L
+ 
diff --git a/x11/tabbed/files/patch-config.mk b/x11/tabbed/files/patch-config.mk
deleted file mode 100644
index 14333c2b76bd..000000000000
--- a/x11/tabbed/files/patch-config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- config.mk.orig	2014-01-21 18:22:03 UTC
-+++ config.mk
-@@ -8,12 +8,12 @@ MANPREFIX = ${PREFIX}/share/man
- MANPREFIX = ${PREFIX}/share/man
- 
- # includes and libs
--INCS = -I. -I/usr/include
--LIBS = -L/usr/lib -lc -lX11
-+INCS = -I. -I${LOCALBASE}/include
-+LIBS = -L${LOCALBASE}/lib -lX11
- 
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
--CFLAGS = -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-+CFLAGS += -Wall ${INCS} ${CPPFLAGS}
- LDFLAGS = -s ${LIBS}
- 
- # Solaris