diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 972d9e052c02..aba7cd7e3667 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	povray
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.7.0.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	37
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Persistence of Vision Ray Tracer
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		autoreconf:build compiler:c11 gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	POV-Ray
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	COMPILED_BY=${MAINTAINER} \
 		--program-transform-name='s/povray/${PKGBASE}/' \
 		--disable-optimiz
 
 VERSION_BASE=	${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}
 DATADIR=	${PREFIX}/share/${PORTNAME}-${VERSION_BASE}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${VERSION_BASE}
 ETCDIR=		${PREFIX}/etc/${PORTNAME}/${VERSION_BASE}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${VERSION_BASE}
 
 OPTIONS_DEFINE=	X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
 OPTIONS_DEFAULT=PNG JPEG
 OPTIONS_SUB=	yes
 
 DOCS_DESC=	Install HTML documentation
 EXAMPLES_DESC=	Install example scenes
 IO_DESC=	Without I/O restrictions (security risk)
 
 IO_CONFIGURE_ON=	--disable-io-restrictions
 STATIC_CONFIGURE_ON=	--enable-static
 X11_USES=		sdl xorg
 X11_USE=		XORG=xpm,sm,ice,x11 SDL=sdl
 X11_CONFIGURE_OFF=	--without-x
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPNG}
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	png>=1.4:graphics/png
 .else
 LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 .else
 CONFIGURE_ARGS+=--without-libpng
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
 .if ${PORT_OPTIONS:MSTATIC}
 USES+=		jpeg:build
 .else
 USES+=		jpeg
 .endif
 .else
 CONFIGURE_ARGS+=--without-libjpeg
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	tiff>=4:graphics/tiff
 .else
 LIB_DEPENDS+=	libtiff.so:graphics/tiff
 .endif
 .else
 CONFIGURE_ARGS+=--without-libtiff
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	openexr>=1.6:graphics/openexr
 .else
-LIB_DEPENDS+=	libIlmImf.so:graphics/openexr
-CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR
+LIB_DEPENDS+=	libOpenEXR.so:graphics/openexr libImath.so:math/Imath
+CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR -I${LOCALBASE}/include/Imath -DInt64=uint64_t
 .endif
 .else
 CONFIGURE_ARGS+=--without-openexr
 .endif
 
 .if !${PORT_OPTIONS:MPNG} || !${PORT_OPTIONS:MJPEG} || !${PORT_OPTIONS:MTIFF}
 CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes
 .endif
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-patch:
 	${REINPLACE_CMD} -e 's|@@EXAMPLESDIR@@|${EXAMPLESDIR}|' \
 		-e 's|@@ETCDIR@@|${ETCDIR}|' \
 		${WRKSRC}/unix/povray.conf
 
 pre-configure:
 	cd ${WRKSRC}/unix && ./prebuild.sh
 
 pre-build:
 .if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}
 #	graphics/tiff adds dependencies on libjpeg, libjbig and liblzma
 	@${REINPLACE_CMD} -e 's,^\(LIBS = .*\)-ltiff\(.*\),\1-ltiff -ljpeg -ljbig -llzma\2,' ${WRKSRC}/unix/Makefile
 .endif
 
 post-install:
 	${MV} ${STAGEDIR}${DATADIR}/scenes ${STAGEDIR}${EXAMPLESDIR}
 .for i in povray.conf povray.ini
 	${MV} ${STAGEDIR}${ETCDIR}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/povray37/files/patch-source_backend_povray.cpp b/graphics/povray37/files/patch-source_backend_povray.cpp
new file mode 100644
index 000000000000..61bbaf34ab68
--- /dev/null
+++ b/graphics/povray37/files/patch-source_backend_povray.cpp
@@ -0,0 +1,11 @@
+--- source/backend/povray.cpp.orig	2018-05-27 09:54:06 UTC
++++ source/backend/povray.cpp
+@@ -68,7 +68,7 @@
+ 		extern "C" const char* TIFFGetVersion(void);
+ 	#endif
+     #ifndef OPENEXR_MISSING
+-        #include <IlmBaseConfig.h>
++        #include <ImathConfig.h>
+         #include <OpenEXRConfig.h>
+         // NOTE:
+         //  Versions of OpenEXR and IlmImf prior to 1.7.1 do not seem to have a way to get the version number,
diff --git a/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4 b/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4
new file mode 100644
index 000000000000..5bdd9b4deabf
--- /dev/null
+++ b/graphics/povray37/files/patch-unix_config_ax__check__openexr.m4
@@ -0,0 +1,11 @@
+--- unix/config/ax_check_openexr.m4.orig	2018-05-27 09:54:06 UTC
++++ unix/config/ax_check_openexr.m4
+@@ -56,7 +56,7 @@ AC_DEFUN([AX_CHECK_OPENEXR],
+       # check include file
+       AC_CHECK_HEADER(
+         [OpenEXR/ImfCRgbaFile.h],
+-        [AC_CHECK_LIB([IlmImf], [ImfInputReadPixels], [], [ax_check_openexr="not found"])],
++        [AC_CHECK_LIB([OpenEXR], [ImfInputReadPixels], [], [ax_check_openexr="not found"])],
+         [ax_check_openexr="no headers"]
+       )
+     fi