diff --git a/x11-wm/qtile/Makefile b/x11-wm/qtile/Makefile
index 922b0168504e..6a7982e1947d 100644
--- a/x11-wm/qtile/Makefile
+++ b/x11-wm/qtile/Makefile
@@ -1,41 +1,51 @@
 # Created by: William Grzybowski <william88@gmail.com>
 
 PORTNAME=	qtile
-PORTVERSION=	0.14.2
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.17.0
 CATEGORIES=	x11-wm
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ericbsd@FreeBSD.org
 COMMENT=	Small, flexible, scriptable tiling window manager written in Python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}cffi>1.1.0:devel/py-cffi@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>1.1.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>1.4.1:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cairocffi>0.7:graphics/py-cairocffi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xcffib>=0.5.0:x11/py-xcffib@${PY_FLAVOR}
-LIB_DEPENDS=	libpangocairo-1.0.so:x11-toolkits/pango
+		${PYTHON_PKGNAMEPREFIX}xcffib>=0.5.0:x11/py-xcffib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+LIB_DEPENDS=	libpangocairo-1.0.so:x11-toolkits/pango \
+		libpulse.so:audio/pulseaudio
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xcffib>=0.5.0:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cairocffi>=0.9:graphics/py-cairocffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	qtile
-
 USE_GNOME=	pygobject3
 
-USES=		gnome python:3.4+
+USES=		gnome python:3.7+ localbase
 USE_PYTHON=	distutils autoplist noflavors
 NO_ARCH=	yes
 
+SUB_FILES=	qtile.desktop
+
 PORTDOCS=	CHANGELOG README.rst
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
+	(cd ${WRKDIR} && ${INSTALL_DATA} qtile.desktop \
+		${STAGEDIR}${PREFIX}/share/xsessions)
+
+
 .include <bsd.port.mk>
diff --git a/x11-wm/qtile/distinfo b/x11-wm/qtile/distinfo
index 4d8b6bfddaf7..da47d1556f5a 100644
--- a/x11-wm/qtile/distinfo
+++ b/x11-wm/qtile/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577286289
-SHA256 (qtile-qtile-v0.14.2_GH0.tar.gz) = a7f36a67d63b8a7bf8b7d1cb4d9dfe19a84f546d23d4a0a4128d0e0df33b951f
-SIZE (qtile-qtile-v0.14.2_GH0.tar.gz) = 492274
+TIMESTAMP = 1623755338
+SHA256 (qtile-0.17.0.tar.gz) = 372e53c1a3f2d1f2505ecfbeeb0aa4a4b07f99132ff0962146c4aacb0ecdc3a3
+SIZE (qtile-0.17.0.tar.gz) = 336235
diff --git a/x11-wm/qtile/files/qtile.desktop.in b/x11-wm/qtile/files/qtile.desktop.in
new file mode 100644
index 000000000000..a68cea4385df
--- /dev/null
+++ b/x11-wm/qtile/files/qtile.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qtile
+Comment=This session logs you into Qtile
+Exec=qtile start
+TryExec=qtile
+Icon=
+Type=Application
+Keywords=launch;qtile;desktop;session;
+
diff --git a/x11-wm/qtile/pkg-plist b/x11-wm/qtile/pkg-plist
index d5628954fe78..b2e7bc22b046 100644
--- a/x11-wm/qtile/pkg-plist
+++ b/x11-wm/qtile/pkg-plist
@@ -1,2 +1,3 @@
 %%PYTHON_SITELIBDIR%%/libqtile/_ffi_pango.py
-%%PYTHON_SITELIBDIR%%/libqtile/core/_ffi_xcursors.py
+%%PYTHON_SITELIBDIR%%/libqtile/backend/x11/_ffi_xcursors.py
+share/xsessions/qtile.desktop