diff --git a/misc/cuttlefish/Makefile b/misc/cuttlefish/Makefile
index 5f2eaf6495cd..8de2849f3428 100644
--- a/misc/cuttlefish/Makefile
+++ b/misc/cuttlefish/Makefile
@@ -1,36 +1,38 @@
 PORTNAME=	cuttlefish
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.2
 CATEGORIES=	misc
 PKGNAMESUFFIX=	-texture-compressor
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Texture compression library and tool
 WWW=		https://github.com/akb825/Cuttlefish
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 TEST_DEPENDS=	ispc:devel/ispc
 
-USES=		cmake:testing compiler:c++11-lang
+USES=		cmake:testing compiler:c++11-lang dos2unix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	akb825
 GH_PROJECT=	Cuttlefish
 GH_TUPLE=	akb825:freeimage:dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076:akb825_freeimage/lib/FreeImage \
 		akb825:etc2comp:10ec1fc4987c5a81c48c6bf6319bb77389a5f23a:akb825_etc2comp/lib/etc2comp \
 		ARM-software:astc-encoder:f48cc27b2528286126c116f42f2792ed2fa13755:ARM_software_astc_encoder/lib/astc-encoder \
 		g-truc:glm:bf71a834948186f4097caa076cd2663c69a10e1e:g_truc_glm/lib/glm \
 		akb825:PVRTexToolLib:ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9:akb825_PVRTexToolLib/lib/PVRTexToolLib \
 		richgel999:bc7enc_rdo:f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2:richgel999_bc7enc_rdo/lib/bc7enc_rdo \
 		GPUOpen-Tools:compressonator:a429164726337b83fd8e20871eb74f5be1d6ef1c:GPUOpen_Tools_compressonator/lib/compressonator \
 		GameTechDev:ISPCTextureCompressor:14d998c02b71c356ff3a1ec1adc9243a517bbf38:GameTechDev_ISPCTextureCompressor/lib/ISPCTextureCompressor \
 		akb825:libsquish:a9087786ced42a1a4ee137c1ad5bf197dd2d6b72:akb825_libsquish/lib/libsquish \
 		google:googletest:703bd9caab50b139428cea1aaff9974ebee5742e:google_googletest/lib/astc-encoder/Source/GoogleTest
 
 CMAKE_OFF=	CUTTLEFISH_BUILD_DOCS CUTTLEFISH_BUILD_TESTS
 CMAKE_ON=	CUTTLEFISH_SHARED
 CMAKE_TESTING_ON=	CUTTLEFISH_BUILD_TESTS
+DOS2UNIX_FILES=	lib/FreeImage/Source/FreeImage/PluginDDS.cpp \
+		lib/FreeImage/Source/FreeImage/PluginBMP.cpp
 
 .include <bsd.port.mk>
diff --git a/misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginBMP.cpp b/misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginBMP.cpp
new file mode 100644
index 000000000000..a25093a3b40d
--- /dev/null
+++ b/misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginBMP.cpp
@@ -0,0 +1,29 @@
+--- lib/FreeImage/Source/FreeImage/PluginBMP.cpp.orig	2022-09-12 21:40:45 UTC
++++ lib/FreeImage/Source/FreeImage/PluginBMP.cpp
+@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
+ 
+ 			free(buffer);
+ #ifdef FREEIMAGE_BIGENDIAN
+-		} else if (bpp == 16) {
++		} else if (dst_bpp == 16) {
+ 			int padding = dst_pitch - dst_width * sizeof(WORD);
+ 			WORD pad = 0;
+ 			WORD pixel;
+@@ -1440,7 +1440,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
+ 			}
+ #endif
+ #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
+-		} else if (bpp == 24) {
++		} else if (dst_bpp == 24) {
+ 			int padding = dst_pitch - dst_width * sizeof(FILE_BGR);
+ 			DWORD pad = 0;
+ 			FILE_BGR bgr;
+@@ -1461,7 +1461,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
+ 					}
+ 				}
+ 			}
+-		} else if (bpp == 32) {
++		} else if (dst_bpp == 32) {
+ 			FILE_BGRA bgra;
+ 			for(unsigned y = 0; y < dst_height; y++) {
+ 				BYTE *line = FreeImage_GetScanLine(dib, y);
diff --git a/misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginDDS.cpp b/misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginDDS.cpp
new file mode 100644
index 000000000000..85d4ad587073
--- /dev/null
+++ b/misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginDDS.cpp
@@ -0,0 +1,25 @@
+--- lib/FreeImage/Source/FreeImage/PluginDDS.cpp.orig	2022-09-12 21:40:59 UTC
++++ lib/FreeImage/Source/FreeImage/PluginDDS.cpp
+@@ -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]);