diff --git a/sysutils/clockspeed/Makefile b/sysutils/clockspeed/Makefile
index 9b81eada5659..e6bd0fc6b048 100644
--- a/sysutils/clockspeed/Makefile
+++ b/sysutils/clockspeed/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	clockspeed
 PORTVERSION=	0.62
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cr.yp.to/clockspeed/ \
 		http://redundancy.redundancy.org/mirror/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Uses a hardware tick counter to compensate for deviant system clock
 WWW=		https://cr.yp.to/clockspeed.html
 
 LIB_DEPENDS=	libtai.so:devel/libtai
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 USES=		groff
 
 MAN_FILES=	clockadd.1 clockspeed.1 clockview.1 sntpclock.1 \
 		taiclock.1 taiclockd.1
 BIN_FILES=	clockadd clockspeed clockview sntpclock taiclock taiclockd
 
 PREFIX_FIX_FILES=	leapsecs_read.c INSTALL
 CLOCKSPEED_RC_SCRIPT_SAMPLE=	${FILESDIR}/clockspeed.sh.sample
 RC_SCRIPT_STARTUP_DIR=		${PREFIX}/etc/rc.d
 
 OPTIONS_DEFINE=	DOCS
 
 SUB_FILES=	pkg-message
 
 post-extract:
 # get this port working under FreeBSD non-i386
 	@${INSTALL} ${FILESDIR}/tryclock_gettime.c ${WRKSRC}
 	@${ECHO} tryclock_gettime.c >> ${WRKSRC}/FILES
 .for file in SYSDEPS TARGETS
 	@${ECHO} hasclock_gettime.h >> ${WRKSRC}/${file}
 .endfor
 
 post-patch:
 	@${SED} "s!/usr/local/!${PREFIX}!" ${CLOCKSPEED_RC_SCRIPT_SAMPLE} > \
 		${WRKDIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T}
 .for file in ${PREFIX_FIX_FILES}
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
 .endfor
 
 do-configure:
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} ${CC} -s -L${LOCALBASE}/lib > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 
 post-build:
 	${CP} ${FILESDIR}/leapsecs.dat ${WRKSRC}/leapsecs.dat
 
 do-install:
 .for i in ${BIN_FILES}
 	${INSTALL} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/bin/
 .endfor
 .for i in ${MAN_FILES}
 	${INSTALL} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/share/man/man1/
 .endfor
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
 		${STAGEDIR}/${PREFIX}/etc/clockspeed
 	${INSTALL_DATA} ${WRKSRC}/leapsecs.dat ${STAGEDIR}/${ETCDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} \
 		${STAGEDIR}/${RC_SCRIPT_STARTUP_DIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PKGMESSAGE} \
 		${STAGEDIR}${DOCSDIR}/INSTALL-FreeBSD
 
 .include <bsd.port.mk>
diff --git a/sysutils/clockspeed/files/patch-error.h b/sysutils/clockspeed/files/patch-error.h
new file mode 100644
index 000000000000..e35ddb04802a
--- /dev/null
+++ b/sysutils/clockspeed/files/patch-error.h
@@ -0,0 +1,11 @@
+--- error.h.orig
++++ error.h
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/sysutils/clockspeed/files/patch-leapsecs_read.c b/sysutils/clockspeed/files/patch-leapsecs_read.c
index b05ea4f8375e..dfbcb97ce82f 100644
--- a/sysutils/clockspeed/files/patch-leapsecs_read.c
+++ b/sysutils/clockspeed/files/patch-leapsecs_read.c
@@ -1,11 +1,19 @@
---- leapsecs_read.c.orig	Thu May 24 20:07:04 2001
-+++ leapsecs_read.c	Thu May 24 20:12:33 2001
-@@ -18,7 +18,7 @@
+--- leapsecs_read.c.orig
++++ leapsecs_read.c
+@@ -2,7 +2,6 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-extern int errno;
+ #include "tai.h"
+ #include "leapsecs.h"
+ 
+@@ -18,7 +17,7 @@
    int i;
    struct tai u;
  
 -  fd = open("/etc/leapsecs.dat",O_RDONLY | O_NDELAY);
 +  fd = open("%%PREFIX%%/etc/clockspeed/leapsecs.dat",O_RDONLY | O_NDELAY);
    if (fd == -1) {
      if (errno != ENOENT) return -1;
      if (leapsecs) free(leapsecs);