diff --git a/filesystems/py-fs/Makefile b/filesystems/py-fs/Makefile
index 71167d09f263..9f600e5d99a6 100644
--- a/filesystems/py-fs/Makefile
+++ b/filesystems/py-fs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2019/01/16 08:34:53 adam Exp $
+# $NetBSD: Makefile,v 1.2 2019/12/13 11:22:51 adam Exp $
 
-DISTNAME=	fs-2.2.1
+DISTNAME=	fs-2.4.11
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	filesystems python
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/fs/}
@@ -16,6 +16,16 @@ DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-six>=1.10:../../lang/py-six
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-pyftpdlib-[0-9]*:../../net/py-pyftpdlib
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} == 27
+DEPENDS+=	${PYPKGPREFIX}-backports.os>=0.1:../../devel/py-backports.os
+DEPENDS+=	${PYPKGPREFIX}-enum34>=1.1.6:../../devel/py-enum34
+DEPENDS+=	${PYPKGPREFIX}-typing>=3.6:../../devel/py-typing
+.else
+PYSETUPTESTTARGET=	pytest
+.endif
 
 USE_LANGUAGES=	# none
 
diff --git a/filesystems/py-fs/PLIST b/filesystems/py-fs/PLIST
index 73a809561c65..fced286e1a1f 100644
--- a/filesystems/py-fs/PLIST
+++ b/filesystems/py-fs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/01/16 08:34:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/12/13 11:22:51 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -23,6 +23,9 @@ ${PYSITELIB}/fs/_repr.pyo
 ${PYSITELIB}/fs/_typing.py
 ${PYSITELIB}/fs/_typing.pyc
 ${PYSITELIB}/fs/_typing.pyo
+${PYSITELIB}/fs/_url_tools.py
+${PYSITELIB}/fs/_url_tools.pyc
+${PYSITELIB}/fs/_url_tools.pyo
 ${PYSITELIB}/fs/_version.py
 ${PYSITELIB}/fs/_version.pyc
 ${PYSITELIB}/fs/_version.pyo
diff --git a/filesystems/py-fs/distinfo b/filesystems/py-fs/distinfo
index 12036b976550..119051616eae 100644
--- a/filesystems/py-fs/distinfo
+++ b/filesystems/py-fs/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/01/16 08:34:53 adam Exp $
+$NetBSD: distinfo,v 1.2 2019/12/13 11:22:51 adam Exp $
 
-SHA1 (fs-2.2.1.tar.gz) = a1bcb98e65e7b80c7ce94a76c52643d83c84cc49
-RMD160 (fs-2.2.1.tar.gz) = 097b817c78fc8ce229e2edafc09a9a5914702868
-SHA512 (fs-2.2.1.tar.gz) = 79d1596df18c0fa51ffb661a115c32c76821e24ee905be0dbc6123d8a66921a26c5ea66a7561d2a10b2bdaf4030ce4a5da6445ff5f2ea882c63a32d4fe711d35
-Size (fs-2.2.1.tar.gz) = 122543 bytes
+SHA1 (fs-2.4.11.tar.gz) = e5456119c108e60166ce00130883355b0f806fae
+RMD160 (fs-2.4.11.tar.gz) = 81c9354dbc5f8486a98849016038d13ca6c14054
+SHA512 (fs-2.4.11.tar.gz) = 8a4e25b47427d8467e697ac5eff645130f159f0479386c958ebcc87839e6b8d4b2d46c3bb078208eb067629078960fde551fa14842cf65ff29afb0238911b4f5
+Size (fs-2.4.11.tar.gz) = 128125 bytes
+SHA1 (patch-tests_conftest.py) = cb8f0cfc5358b1fc87555b31f7a077d96bc397bb