diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index 48ffe704b95b..04ac430f0d73 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	freeimage
 PORTVERSION=	3.18.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
 DISTNAME=	FreeImage${PORTVERSION:S/.//g}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple C/C++ bitmap graphics library
 WWW=		http://freeimage.sourceforge.net/
 
 LICENSE=		FIPL GPLv2 GPLv3
 LICENSE_COMB=		multi
 LICENSE_NAME_FIPL=	FreeImage Public License
 LICENSE_FILE_FIPL=	${WRKSRC}/license-fi.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/license-gplv2.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/license-gplv3.txt
 LICENSE_PERMS_FIPL=	dist-mirror pkg-mirror auto-accept
 
 BROKEN_mips=		fails to compile: section referenced in discarded section
 BROKEN_mips64=		fails to compile: opcode not supported on this processor: mips3 (mips3) 'madd $4,$5'
 
 USES=		cpe dos2unix gmake zip
 CPE_VENDOR=	${PORTNAME}_project
 DOS2UNIX_FILES=	Source/LibOpenJPEG/opj_malloc.h \
 		Source/LibRawLite/dcraw/dcraw.c \
 		Source/LibRawLite/internal/dcraw_common.cpp \
 		Source/FreeImage/PluginBMP.cpp \
 		Source/FreeImage/PluginDDS.cpp \
 		Source/LibPNG/pngpriv.h
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	CC="${CC}" CPP="${CPP}" CXX="${CXX}"
 CFLAGS+=	-DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden -fPIC
 CXXFLAGS+=	-DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden -fPIC
 
 SUB_FILES=	freeimage.pc
 SUB_LIST=	name="${PORTNAME}" \
 		description="${COMMENT}" \
 		version="${PORTVERSION}"
 
 WRKSRC=		${WRKDIR}/FreeImage
 
 PLIST_FILES=	include/FreeImage.h \
 		include/FreeImagePlus.h \
 		lib/libfreeimage.a \
 		lib/libfreeimage-${PORTVERSION}.so \
 		lib/libfreeimage.so.3 \
 		lib/libfreeimage.so \
 		lib/libfreeimageplus.a \
 		lib/libfreeimageplus-${PORTVERSION}.so \
 		lib/libfreeimageplus.so.3 \
 		lib/libfreeimageplus.so \
 		libdata/pkgconfig/freeimage.pc
 
 PKGCONFIGDIR?=	${PREFIX}/libdata/pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-o root -g root || ; \
 		/^-fPIC/d' ${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
 
 post-build:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${_MAKE_JOBS} \
 		${MAKE_ARGS} -C ${BUILD_WRKSRC}
 
 post-install:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${MAKE_ARGS} \
 		-C ${INSTALL_WRKSRC} ${INSTALL_TARGET}
 	${LN} -sf libfreeimageplus.so.3 \
 		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so
 	${LN} -sf libfreeimageplus-${PORTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so.3
 	${INSTALL_DATA} ${WRKDIR}/freeimage.pc ${STAGEDIR}${PKGCONFIGDIR}/
 
 .include <bsd.port.mk>
diff --git a/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp b/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp
index 874045df1529..8f80affd8f0c 100644
--- a/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp
+++ b/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp
@@ -1,17 +1,25 @@
 --- Source/FreeImage/PluginDDS.cpp.orig	2018-11-18 16:17:59 UTC
 +++ Source/FreeImage/PluginDDS.cpp
-@@ -356,14 +356,6 @@ SwapHeader(DDSHEADER *header) {
+@@ -356,14 +356,14 @@ SwapHeader(DDSHEADER *header) {
  	for(int i=0; i<11; i++) {
  		SwapLong(&header->surfaceDesc.dwReserved1[i]);
  	}
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwSize);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFlags);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFourCC);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBBitCount);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRBitMask);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask);
 -	SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask);
++	SwapLong(&header->surfaceDesc.ddspf.dwSize);
++	SwapLong(&header->surfaceDesc.ddspf.dwFlags);
++	SwapLong(&header->surfaceDesc.ddspf.dwFourCC);
++	SwapLong(&header->surfaceDesc.ddspf.dwRGBBitCount);
++	SwapLong(&header->surfaceDesc.ddspf.dwRBitMask);
++	SwapLong(&header->surfaceDesc.ddspf.dwGBitMask);
++	SwapLong(&header->surfaceDesc.ddspf.dwBBitMask);
++	SwapLong(&header->surfaceDesc.ddspf.dwRGBAlphaBitMask);
  	SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1);
  	SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2);
  	SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]);