diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index 48ba2a5dfb5e..5fb28c4e7f14 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -1,45 +1,41 @@
 PORTNAME=	sqlite3
 DISTVERSION=	${PYTHON_DISTVERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${DISTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Standard Python binding to the SQLite3 library (Python ${PYTHON_VER})
 
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKDIR}/Python-${DISTVERSION}/LICENSE
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 PORTSCOUT=	ignore:1
 
-USES=		compiler:c11 python:2.7+ tar:xz
+USES=		compiler:c11 python tar:xz
 USE_PYTHON=	autoplist distutils allflavors
 
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
 WRKSRC_SUBDIR=	Modules
 
 PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
 
 TESTING_UNSAFE=	ModuleNotFoundError: No module named '_sqlite3'
 
 .include <bsd.port.pre.mk>
 
 post-extract:
-.if ${PYTHON_REL} < 30000
 	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
-.else
-	@${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py
-.endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_sqlite3*.so
 
 do-test:
 	@${PYTHON_CMD} -c 'import sqlite3'  # minimal smoke test
 
 .include <bsd.port.post.mk>
diff --git a/databases/py-sqlite3/files/setup.py b/databases/py-sqlite3/files/setup.py
index a8f34bfaf386..944c89920852 100644
--- a/databases/py-sqlite3/files/setup.py
+++ b/databases/py-sqlite3/files/setup.py
@@ -1,48 +1,56 @@
 #!/usr/bin/env python
 # To use:
 #       python setup.py install
 #
 
+import platform
+
 try:
     import distutils
     from distutils import sysconfig
     from distutils.command.install import install
     from distutils.core import setup, Extension
 except:
-    raise SystemExit, "Distutils problem"
+    raise SystemExit("Distutils problem")
 
-install.sub_commands = filter(lambda (cmd, avl): 'egg' not in cmd,
-                              install.sub_commands)
+install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]]
 
 prefix = sysconfig.PREFIX
 inc_dirs = [prefix + "/include", "Modules/_sqlite"]
 lib_dirs = [prefix + "/lib"]
 libs = ["sqlite3"]
 macros = [('MODULE_NAME', '"sqlite3"')]
 sqlite_srcs = [
-'_sqlite/cache.c',
 '_sqlite/connection.c',
 '_sqlite/cursor.c',
 '_sqlite/microprotocols.c',
 '_sqlite/module.c',
 '_sqlite/prepare_protocol.c',
 '_sqlite/row.c',
 '_sqlite/statement.c',
 '_sqlite/util.c']
 
+major, minor = map(int, platform.python_version_tuple()[:2])
+
+if (major, minor) <= (3, 10):
+    sqlite_srcs.append('_sqlite/cache.c',)
+
+if (major, minor) >= (3, 11):
+    sqlite_srcs.append('_sqlite/blob.c',)
+
 try:
     import ctypes
     ctypes.CDLL('libsqlite3.so').sqlite3_load_extension
 except AttributeError:
     macros.append(('SQLITE_OMIT_LOAD_EXTENSION', '1'))
 
 setup(name = "sqlite3",
       description = "SQLite 3 extension to Python",
 
       ext_modules = [Extension('_sqlite3', sqlite_srcs,
                                include_dirs = inc_dirs,
                                libraries = libs,
                                library_dirs = lib_dirs,
                                runtime_library_dirs = lib_dirs,
                                define_macros = macros)]
       )
diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py
deleted file mode 100644
index 944c89920852..000000000000
--- a/databases/py-sqlite3/files/setup3.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-# To use:
-#       python setup.py install
-#
-
-import platform
-
-try:
-    import distutils
-    from distutils import sysconfig
-    from distutils.command.install import install
-    from distutils.core import setup, Extension
-except:
-    raise SystemExit("Distutils problem")
-
-install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]]
-
-prefix = sysconfig.PREFIX
-inc_dirs = [prefix + "/include", "Modules/_sqlite"]
-lib_dirs = [prefix + "/lib"]
-libs = ["sqlite3"]
-macros = [('MODULE_NAME', '"sqlite3"')]
-sqlite_srcs = [
-'_sqlite/connection.c',
-'_sqlite/cursor.c',
-'_sqlite/microprotocols.c',
-'_sqlite/module.c',
-'_sqlite/prepare_protocol.c',
-'_sqlite/row.c',
-'_sqlite/statement.c',
-'_sqlite/util.c']
-
-major, minor = map(int, platform.python_version_tuple()[:2])
-
-if (major, minor) <= (3, 10):
-    sqlite_srcs.append('_sqlite/cache.c',)
-
-if (major, minor) >= (3, 11):
-    sqlite_srcs.append('_sqlite/blob.c',)
-
-try:
-    import ctypes
-    ctypes.CDLL('libsqlite3.so').sqlite3_load_extension
-except AttributeError:
-    macros.append(('SQLITE_OMIT_LOAD_EXTENSION', '1'))
-
-setup(name = "sqlite3",
-      description = "SQLite 3 extension to Python",
-
-      ext_modules = [Extension('_sqlite3', sqlite_srcs,
-                               include_dirs = inc_dirs,
-                               libraries = libs,
-                               library_dirs = lib_dirs,
-                               runtime_library_dirs = lib_dirs,
-                               define_macros = macros)]
-      )