diff --git a/devel/py-cbor2/Makefile b/devel/py-cbor2/Makefile
index 94f784b36840..0e7fbf653d12 100644
--- a/devel/py-cbor2/Makefile
+++ b/devel/py-cbor2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cbor2
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,12 +12,17 @@ MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Pure Python CBOR (de)serializer with extensive tag support
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7.0:devel/py-setuptools_scm@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python:2.7
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
-USE_LOCALE=	en_US.UTF-8
+NO_ARCH=	yes
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/devel/py-cbor2/files/patch-setup.cfg b/devel/py-cbor2/files/patch-setup.cfg
new file mode 100644
index 000000000000..3c01ac98bad5
--- /dev/null
+++ b/devel/py-cbor2/files/patch-setup.cfg
@@ -0,0 +1,37 @@
+# Added encoding declaration to setup.cfg
+# https://github.com/agronholm/cbor2/commit/ba05c122
+# https://github.com/agronholm/cbor2/issues/38
+
+# pytest uses py which vendors iniconfig, which isn't unicode aware
+# Patch out unicode characters for now
+# https://github.com/pytest-dev/pytest/issues/3799
+# https://github.com/RonnyPfannschmidt/iniconfig/issues/5
+# https://github.com/RonnyPfannschmidt/iniconfig/issues/4
+
+# coverage is not a compulsory dependency
+# this block clobbers ports pytest args
+
+--- setup.cfg.orig	2018-12-10 13:39:24 UTC
++++ setup.cfg
+@@ -1,8 +1,9 @@
++# coding: utf-8
+ [metadata]
+ name = cbor2
+ description = Pure Python CBOR (de)serializer with extensive tag support
+ long_description = file: README.rst
+-author = Alex Grönholm
++author = Alex Gronholm
+ author_email = alex.gronholm@nextday.fi
+ project_urls = 
+ 	Documentation = https://cbor2.readthedocs.org/en/latest/
+@@ -30,10 +31,6 @@ packages = find:
+ test = 
+ 	pytest
+ 	pytest-cov
+-
+-[tool:pytest]
+-addopts = -rsx --cov --tb=short
+-testpaths = tests
+ 
+ [coverage:run]
+ source = cbor2
diff --git a/devel/py-cbor2/pkg-descr b/devel/py-cbor2/pkg-descr
index 7216c054c228..792d99a2ff87 100644
--- a/devel/py-cbor2/pkg-descr
+++ b/devel/py-cbor2/pkg-descr
@@ -5,7 +5,7 @@ There exists another Python CBOR implementation (cbor) which is faster on
 CPython due to its C extensions. On PyPy, cbor2 and cbor are almost identical
 in performance. The other implementation also lacks documentation and a
 comprehensive test suite, does not support most standard extension tags and is
-known to crash (segfault) when passed a cyclic structure (say, a list 
+known to crash (segfault) when passed a cyclic structure (say, a list
 containing itself).
 
 WWW: https://pypi.org/project/cbor2/