diff --git a/x11/tabbed/Makefile b/x11/tabbed/Makefile
index 4de5ec968f5e..be06d5f9b8a2 100644
--- a/x11/tabbed/Makefile
+++ b/x11/tabbed/Makefile
@@ -1,35 +1,37 @@
 PORTNAME=	tabbed
 PORTVERSION=	0.6
+PORTREVISION=	1
 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
 
 USES=		xorg
 USE_XORG=	x11
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/tabbed \
-		man/man1/tabbed.1.gz
+		share/man/man1/tabbed.1.gz
 PORTDOCS=	LICENSE README
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}"
 
 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}
 
 .include <bsd.port.mk>
diff --git a/x11/tabbed/files/patch-config.mk b/x11/tabbed/files/patch-config.mk
index f1fdf2681a36..14333c2b76bd 100644
--- a/x11/tabbed/files/patch-config.mk
+++ b/x11/tabbed/files/patch-config.mk
@@ -1,29 +1,18 @@
 --- config.mk.orig	2014-01-21 18:22:03 UTC
 +++ config.mk
-@@ -5,15 +5,15 @@ VERSION = 0.6
- 
- # paths
- PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX = ${PREFIX}/man
+@@ -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
-@@ -21,5 +21,5 @@ LDFLAGS = -s ${LIBS}
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC?= cc
-