diff --git a/textproc/Makefile b/textproc/Makefile
index e17ea07f7e1f..0613da9ec022 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1361,6 +1361,7 @@
     SUBDIR += py-xlutils
     SUBDIR += py-xlwriter
     SUBDIR += py-xlwt
+    SUBDIR += py-yapf
     SUBDIR += py-zope.app.i18n
     SUBDIR += py-zope.app.locales
     SUBDIR += py-zope.i18nmessageid
diff --git a/textproc/py-yapf/Makefile b/textproc/py-yapf/Makefile
new file mode 100644
index 000000000000..b2d19cc66b27
--- /dev/null
+++ b/textproc/py-yapf/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	yapf
+PORTVERSION=	0.16.2
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	antoine@FreeBSD.org
+COMMENT=	Formatter for Python code
+
+LICENSE=	APACHE20
+
+NO_ARCH=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
+DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP}
+TEST_TARGET=	test
+
+.include <bsd.port.mk>
diff --git a/textproc/py-yapf/distinfo b/textproc/py-yapf/distinfo
new file mode 100644
index 000000000000..2ece71a51b01
--- /dev/null
+++ b/textproc/py-yapf/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1496501208
+SHA256 (yapf-0.16.2.tar.gz) = 96732f1a0bc1b2bc3398ead271cd2409a59f45febc83360cf1ad56ff8c492036
+SIZE (yapf-0.16.2.tar.gz) = 115357
diff --git a/textproc/py-yapf/pkg-descr b/textproc/py-yapf/pkg-descr
new file mode 100644
index 000000000000..ecaec2966fe3
--- /dev/null
+++ b/textproc/py-yapf/pkg-descr
@@ -0,0 +1,3 @@
+A formatter for Python code.
+
+WWW: https://github.com/google/yapf