diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 00a8013f5d9e..b90be682e5f0 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	daemontools
 PORTVERSION=	0.76
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cr.yp.to/daemontools/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,1 \
 		LOCAL/bdrewery/${PORTNAME}/:DEFAULT,1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Service monitoring and logging utilities by djb
 WWW=		https://cr.yp.to/daemontools.html
 
 LICENSE=	PD
 
 CONFLICTS=	daemontools-encore freedt serialmail
 
 OPTIONS_DEFINE=	MAN SIGQ12 TESTS
 OPTIONS_SUB=	yes
 MAN_DESC=	Install Gerrit Pape's manual pages
 S_EARLY_DESC=	Start early, before the normal daemons
 S_NORMAL_DESC=	Start normally in the usual boot sequence
 SIGQ12_DESC=	Add svc support for QUIT, USR1, and USR2 signals
 TESTS_DESC=	Run the test suite, fails on NFS-mounted workdir
 
 OPTIONS_SINGLE=	SEQ
 OPTIONS_SINGLE_SEQ=	S_EARLY S_NORMAL
 
 OPTIONS_DEFAULT=	MAN S_NORMAL TESTS
 
 .include <bsd.port.options.mk>
 
 . if ${PORT_OPTIONS:MS_EARLY}
 SVSCAN_REQUIRE?=	SERVERS
 SVSCAN_BEFORE?=		DAEMON
 . endif
 
 . if ${PORT_OPTIONS:MS_NORMAL}
 SVSCAN_REQUIRE?=	LOGIN
 SVSCAN_BEFORE?=
 . endif
 
 SUB_LIST+=	SVSCAN_REQUIRE=${SVSCAN_REQUIRE} SVSCAN_BEFORE=${SVSCAN_BEFORE}
 
 .if ${PORT_OPTIONS:MMAN}
 MANDATE=	-20010714
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
 .endif
 
 .if ${PORT_OPTIONS:MSIGQ12}
 #PATCH_SITES+=	http://thedjbway.org/patches/:sigq12
 PATCH_SITES+=		LOCAL/bdrewery/${PORTNAME}/:sigq12
 PATCHFILES+=		daemontools-0.76.sigq12.patch:-p2:sigq12
 .endif
 
 USE_RC_SUBR=	svscan
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}/src
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 .if ${PORT_OPTIONS:MTESTS}
 EXTRA_PATCHES+=	${FILESDIR}/rts-skip.patch
 .endif
 
 post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 
 do-install:
 	(while read cmd; do \
 		if ${FILE} ${WRKSRC}/$$cmd | ${GREP} -q "shell script"; then \
 			${INSTALL_SCRIPT} ${WRKSRC}/$$cmd \
 			    ${STAGEDIR}${PREFIX}/bin; \
 		else \
 			${INSTALL_PROGRAM} ${WRKSRC}/$$cmd \
 			    ${STAGEDIR}${PREFIX}/bin; \
 		fi \
 	done) < ${WRKSRC}/../package/commands
 
 do-install-MAN-on:
 	${INSTALL_MAN} ${WRKDIR}/daemontools-man/*.8 \
 	    ${STAGEDIR}${PREFIX}/share/man/man8/
 
 .include <bsd.port.mk>
diff --git a/sysutils/daemontools/files/patch-error.h b/sysutils/daemontools/files/patch-error.h
new file mode 100644
index 000000000000..d19f3e3b34dc
--- /dev/null
+++ b/sysutils/daemontools/files/patch-error.h
@@ -0,0 +1,11 @@
+--- error.h.orig
++++ error.h
+@@ -3,7 +3,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;