Index: graphics/py-pillow/Makefile
===================================================================
--- graphics/py-pillow/Makefile	(revision 503477)
+++ graphics/py-pillow/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pillow
-PORTVERSION=	5.3.0
+PORTVERSION=	6.0.0
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -17,7 +17,7 @@
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
 
-# Python 2.7,3.4+
+# Python 2.7,3.5+
 USES=		cpe python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
@@ -25,12 +25,11 @@
 GH_ACCOUNT=	python-${PORTNAME}
 GH_PROJECT=	${PORTNAME:C/p/P/}
 
-CONFLICTS_INSTALL=	py*-imaging-*
-
-OPTIONS_DEFINE=		FREETYPE JPEG JPEG2000 LCMS PNG TIFF TKINTER WEBP
+OPTIONS_DEFINE=		FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP
 OPTIONS_DEFAULT=	FREETYPE JPEG JPEG2000 PNG TKINTER WEBP
 
 LCMS_DESC=		Little Color Management System
+OLE_DESC=		MS OLE2 file format support
 TKINTER_DESC=		Tkinter (Tcl/Tk) BitmapImage & PhotoImage support
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
@@ -52,6 +51,8 @@
 PNG_VARS=		PYDISTUTILS_BUILDARGS+=--enable-zlib
 PNG_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-zlib
 
+OLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}olefile>0:devel/py-olefile@${PY_FLAVOR}
+
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_VARS=		PYDISTUTILS_BUILDARGS+=--enable-tiff
 TIFF_VARS_OFF=		PYDISTUTILS_BUILDARGS+=--disable-tiff
Index: graphics/py-pillow/distinfo
===================================================================
--- graphics/py-pillow/distinfo	(revision 503477)
+++ graphics/py-pillow/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542124566
-SHA256 (python-pillow-Pillow-5.3.0_GH0.tar.gz) = 9de4853d8b640c0185665735a1c3266b6d51636b3a3d8e3ea7876c485194b6e1
-SIZE (python-pillow-Pillow-5.3.0_GH0.tar.gz) = 15335960
+TIMESTAMP = 1555711743
+SHA256 (python-pillow-Pillow-6.0.0_GH0.tar.gz) = f0babf5d7072ea9923a3950cd7ea41b0008429b16584de7d95cc5550a2806cda
+SIZE (python-pillow-Pillow-6.0.0_GH0.tar.gz) = 29205509