diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile
index 2b80c1238796..10b5de519671 100644
--- a/security/py-dfvfs/Makefile
+++ b/security/py-dfvfs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dfvfs
-PORTVERSION=	20160108
-PORTREVISION=	1
+PORTVERSION=	20160918
 CATEGORIES=	security devel python
 MASTER_SITES=	https://github.com/log2timeline/dfvfs/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
@@ -18,6 +17,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	libbde>=a:devel/libbde \
 		libewf>=0:devel/libewf \
 		libfsntfs>=e:devel/libfsntfs \
+		libfvde>=0:sysutils/libfvde \
+		libfwnt>=e:devel/libfwnt \
 		libqcow>=a:devel/libqcow \
 		libsigscan>=e:devel/libsigscan \
 		libsmdev>=a:devel/libsmdev \
@@ -25,15 +26,20 @@ RUN_DEPENDS=	libbde>=a:devel/libbde \
 		libvhdi>=e:devel/libvhdi \
 		libvmdk>=e:devel/libvmdk \
 		libvshadow>=0:devel/libvshadow \
+		libvslvm>=e:devel/libvslvm \
+		${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma \
 		${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 NO_ARCH=	yes
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
+TEST_ENV=	${MAKE_ENV} LANG=en_US.UTF-8 PYTHONHTTPSVERIFY=0
 
-# Note: for regression tests set LANG to en_US.UTF-8
+do-test:
+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run_tests.py)
 
 .include <bsd.port.mk>
diff --git a/security/py-dfvfs/distinfo b/security/py-dfvfs/distinfo
index e71b0b44eee1..002f683d2b46 100644
--- a/security/py-dfvfs/distinfo
+++ b/security/py-dfvfs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dfvfs-20160108.tar.gz) = d5569b878f9cee79790aa5768689e576d6b52caaf76edbd87a00ed423a96584c
-SIZE (dfvfs-20160108.tar.gz) = 62250192
+TIMESTAMP = 1474205984
+SHA256 (dfvfs-20160918.tar.gz) = 0eb4f54d745502e43b12456882ee69130b566db05c33c4abefede010422fb666
+SIZE (dfvfs-20160918.tar.gz) = 77646360
diff --git a/security/py-dfvfs/files/patch-dfvfs_vfs_tsk__file__entry.py b/security/py-dfvfs/files/patch-dfvfs_vfs_tsk__file__entry.py
deleted file mode 100644
index 27665a1591ab..000000000000
--- a/security/py-dfvfs/files/patch-dfvfs_vfs_tsk__file__entry.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Sleuthkit 4.2.0 switched from 100 nano seconds precision to
-# 1 nano second precision
-# See: https://github.com/log2timeline/dfvfs/issues/116
-
---- dfvfs/vfs/tsk_file_entry.py.orig	2016-01-11 06:11:52 UTC
-+++ dfvfs/vfs/tsk_file_entry.py
-@@ -348,6 +348,22 @@ class TSKFileEntry(file_entry.FileEntry)
-     stat_object.mtime_nano = getattr(
-         tsk_file.info.meta, u'mtime_nano', None)
- 
-+    # Sleuthkit 4.2.0 switched from 100 nano seconds precision to
-+    # 1 nano second precision.
-+    if pytsk3.TSK_VERSION_NUM >= 0x040200ff:
-+      if stat_object.atime_nano is not None:
-+        stat_object.atime_nano /= 100
-+      if stat_object.bkup_time_nano is not None:
-+        stat_object.bkup_time_nano /= 100
-+      if stat_object.ctime_nano is not None:
-+        stat_object.ctime_nano /= 100
-+      if stat_object.crtime_nano is not None:
-+        stat_object.crtime_nano /= 100
-+      if stat_object.dtime_nano is not None:
-+        stat_object.dtime_nano /= 100
-+      if stat_object.mtime_nano is not None:
-+        stat_object.mtime_nano /= 100
-+
-     # Ownership and permissions stat information.
-     stat_object.mode = getattr(tsk_file.info.meta, u'mode', None)
-     stat_object.uid = getattr(tsk_file.info.meta, u'uid', None)