diff --git a/sysutils/tlsdate/Makefile b/sysutils/tlsdate/Makefile
index 4070d8346160..eeb699fd4feb 100644
--- a/sysutils/tlsdate/Makefile
+++ b/sysutils/tlsdate/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tlsdate
-PORTVERSION=	0.0.7
-PORTREVISION=	1
+PORTVERSION=	0.0.11
 CATEGORIES=	sysutils
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
@@ -14,20 +13,26 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ioerror
-# Technically tlsdate 0.0.7 is 004f6f6, but a couple of follow-up
-# commits are required to fix the build on FreeBSD.
-GH_COMMIT=	44fa3b7
+GH_COMMIT=	5be06de
 GH_TAGNAME=	${GH_COMMIT}
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig
 USE_OPENSSL=	yes
 
+PLIST_SUB+=	PKGNAME=${PKGNAME}
+
 OPTIONS_DEFINE=	DOCS
 
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
+
 post-patch:
-# Required for FreeBSD 8.4
-	@${REINPLACE_CMD} -e 's@AC_MSG_ERROR(\[M@AC_MSG_WARN([M@' ${WRKSRC}/configure.ac
+	${REINPLACE_CMD} -e '/doc_DATA\+= LICENSE/d' ${WRKSRC}/Makefile.am
+
+post-install:
+	@${CHMOD} o+rx ${STAGEDIR}/${PREFIX}/etc/tlsdate ${STAGEDIR}/${PREFIX}/etc/tlsdate/ca-roots
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/licenses/${PKGNAME}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${PREFIX}/share/licenses/${PKGNAME}
 
 regression-test: build
 	@cd ${WRKSRC} && make test
diff --git a/sysutils/tlsdate/distinfo b/sysutils/tlsdate/distinfo
index 4107fb3214cd..179c98a851bc 100644
--- a/sysutils/tlsdate/distinfo
+++ b/sysutils/tlsdate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ioerror-tlsdate-0.0.7-44fa3b7.tar.gz) = 7a1a7f7c64b830c71783df38af4ce10fe0732e83526b6459c3a6e5db4340e309
-SIZE (ioerror-tlsdate-0.0.7-44fa3b7.tar.gz) = 239975
+SHA256 (ioerror-tlsdate-0.0.11-5be06de.tar.gz) = 96f0053574ab0119edec0e46ccedf86bff72092e9461eae71f6b59fabd492e04
+SIZE (ioerror-tlsdate-0.0.11-5be06de.tar.gz) = 263951
diff --git a/sysutils/tlsdate/files/patch-src-include.am b/sysutils/tlsdate/files/patch-src-include.am
deleted file mode 100644
index 936888e9355d..000000000000
--- a/sysutils/tlsdate/files/patch-src-include.am
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5eb482ca5657a91b7641b97ec503ade881889d49 Mon Sep 17 00:00:00 2001
-From: Fabian Keil <fk@fabiankeil.de>
-Date: Sat, 11 Jan 2014 21:58:37 +0100
-Subject: [PATCH] Use fmemopen reimplementation on FreeBSD systems that need it
-
-Apparently FreeBSD 8.4 does.
----
- src/include.am | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git src/include.am src/include.am
-index 259d618..6f230d7 100644
---- src/include.am
-+++ src/include.am
-@@ -231,6 +231,13 @@ endif
- check_PROGRAMS+= src/proxy-bio_unittest
- noinst_PROGRAMS+= src/proxy-bio_unittest
- endif
-+# XXX This conditional should apply for any system where we're building
-+# conf_unittest, but I don't know how to tell that to automake.
-+if !HAVE_FMEMOPEN
-+if HAVE_FUNOPEN
-+src_conf_unittest_SOURCES+= src/common/fmemopen-funopen.c
-+endif
-+endif
- endif
- 
- if TARGET_NETBSD
--- 
-1.8.5.2
-
-From ebfa24395c046e3e732d5be4475f412165bef679 Mon Sep 17 00:00:00 2001
-From: Fabian Keil <fk@fabiankeil.de>
-Date: Sun, 12 Jan 2014 21:02:37 +0100
-Subject: [PATCH] Only compile event_unittest when targetting GNU/Linux
-
-It tests code that currently doesn't compile on FreeBSD and
-it looks like it won't compile on the other non-GNU/Linux
-targets either.
----
- src/include.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git src/include.am src/include.am
-index 6f230d7..c164627 100644
---- src/include.am
-+++ src/include.am
-@@ -439,11 +439,13 @@ endif
- endif
- endif
- 
-+if TARGET_LINUX
- src_event_unittest_SOURCES = src/event.c
- src_event_unittest_SOURCES+= src/event-unittest.c
- src_event_unittest_SOURCES+= src/routeup.c
- src_event_unittest_SOURCES+= src/util.c
- check_PROGRAMS+= src/event_unittest
-+endif
- 
- if !TARGET_OSX
- check_PROGRAMS+= src/test/proxy-override src/test/return-argc \
--- 
-1.8.5.2
-
diff --git a/sysutils/tlsdate/pkg-plist b/sysutils/tlsdate/pkg-plist
index e52ce53daefb..5c37534b8b1b 100644
--- a/sysutils/tlsdate/pkg-plist
+++ b/sysutils/tlsdate/pkg-plist
@@ -7,6 +7,4 @@ man/man1/tlsdate.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/tlsdate/ca-roots
-@dirrmtry etc/tlsdate
+share/licenses/%%PKGNAME%%/LICENSE