diff --git a/sysutils/dvtm/Makefile b/sysutils/dvtm/Makefile
index 340cd7412bb4..ad43c3677167 100644
--- a/sysutils/dvtm/Makefile
+++ b/sysutils/dvtm/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	dvtm
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.brain-dump.org/projects/dvtm/
 
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Tiling window management for the console
 WWW=		https://www.brain-dump.org/projects/dvtm/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		ncurses
 PLIST_FILES=	bin/dvtm bin/dvtm-status \
-		man/man1/dvtm.1.gz
+		share/man/man1/dvtm.1.gz
 
 MAKE_JOBS_UNSAFE=	yes
 
 pre-everything::
 	@${ECHO_MSG} "You can build dvtm with your own config.h using the DVTM_CONF knob:"
 	@${ECHO_MSG} "make DVTM_CONF=/path/to/dvtm/config.h install clean"
 
 post-extract:
 .if defined(DVTM_CONF)
 	@${ECHO_MSG} "creating config.h from ${DVTM_CONF}"
 	@${CP} ${DVTM_CONF} ${WRKSRC}/config.h
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/dvtm/files/patch-config.mk b/sysutils/dvtm/files/patch-config.mk
index ed1a26468137..190f14bc5171 100644
--- a/sysutils/dvtm/files/patch-config.mk
+++ b/sysutils/dvtm/files/patch-config.mk
@@ -1,25 +1,18 @@
 --- config.mk.orig	2016-01-09 11:40:56 UTC
 +++ config.mk
-@@ -4,14 +4,19 @@ VERSION = 0.15
- # Customize below to fit your system
- 
- PREFIX ?= /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+MANPREFIX = ${PREFIX}/man
- # specify your systems terminfo directory
- # leave empty to install into your home folder
+@@ -10,8 +10,13 @@ INCS = -I.
  TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
  
  INCS = -I.
 -LIBS = -lc -lutil -lncursesw
 -CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
 +LIBS = -lc -lutil
 +.if exists(/usr/lib/libncursesw.so)
 +LIBS += -lncursesw
 +.else
 +LIBS += -lncurses
 +.endif
 +CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE
  CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
  LDFLAGS += ${LIBS}