diff --git a/deskutils/py-todoman/Makefile b/deskutils/py-todoman/Makefile
index 974107b7b613..9c9f03936ede 100644
--- a/deskutils/py-todoman/Makefile
+++ b/deskutils/py-todoman/Makefile
@@ -1,38 +1,38 @@
 # $FreeBSD$
 
-PORTNAME=		todoman
-DISTVERSION=	3.5.0
-CATEGORIES=		deskutils python
+PORTNAME=	todoman
+DISTVERSION=	3.6.0
+CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		andreas@bilke.org
-COMMENT=		Simple CalDAV-based todo manager
+MAINTAINER=	andreas@bilke.org
+COMMENT=	Simple CalDAV-based todo manager
 
-LICENSE=		ISCL
+LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}click-log>=0.2.1:devel/py-click-log@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}dateutil>=2.6:devel/py-dateutil@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}icalendar>=4.0.3:devel/py-icalendar@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.2:devel/py-tabulate@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}urwid>=2.0.1:devel/py-urwid@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>0:devel/py-atomicwrites@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-log>=0.2.1:devel/py-click-log@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7.0&&<8.0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}humanize>0:devel/py-humanize@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=4.0.3:devel/py-icalendar@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parsedatetime>0:devel/py-parsedatetime@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
 
-USES=			python:3.5+
-USE_PYTHON=		autoplist distutils
+USES=		python:3.5+
+USE_PYTHON=	autoplist distutils
 
-NO_ARCH=		yes
+NO_ARCH=	yes
 
-PLIST_FILES=	share/zsh/site-functions/_todoman \
-				${EXAMPLESDIR}/todoman.conf.sample
+PLIST_FILES=	${EXAMPLESDIR}/todoman.conf.sample \
+		share/zsh/site-functions/_todoman
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
diff --git a/deskutils/py-todoman/distinfo b/deskutils/py-todoman/distinfo
index a6ce40fb52ab..02b480b4f611 100644
--- a/deskutils/py-todoman/distinfo
+++ b/deskutils/py-todoman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542740061
-SHA256 (todoman-3.5.0.tar.gz) = 89032887051b164527b90cfb947eb5162dd8b8bb64d9abf1e906b8c86f933814
-SIZE (todoman-3.5.0.tar.gz) = 61484
+TIMESTAMP = 1568129088
+SHA256 (todoman-3.6.0.tar.gz) = 60425aa59b7e6f576fb4cec18ec59d1f00fa7c4546cd49f861d27511578212b0
+SIZE (todoman-3.6.0.tar.gz) = 61901