diff --git a/.github/actions/bin-cache/action.yml b/.github/actions/bin-cache/action.yml
index dfc7ef4a..f52c60a5 100644
--- a/.github/actions/bin-cache/action.yml
+++ b/.github/actions/bin-cache/action.yml
@@ -70,6 +70,11 @@ runs:
           src/JPEGView/libjxl/lib/*.lib
           src/JPEGView/libjxl/lib64/*.lib
 
+          src/JPEGView/libraw/bin/*.dll
+          src/JPEGView/libraw/bin64/*.dll
+          src/JPEGView/libraw/lib/*.lib
+          src/JPEGView/libraw/lib64/*.lib
+
     # cache prevents the rebuild-all to happen twice, since each invocation of the workflow (once for x86, once for x64) causes a rebuild
 
     # the cache-hit based on documentation is a string, not a boolean, hence why it looks so funky below
@@ -111,6 +116,11 @@ runs:
       shell: cmd
       run: call extras\scripts\build-libheif_libavif.bat
 
+    - name: libraw
+      if: ${{ steps.cache-bin.outputs.cache-hit != 'true' }}
+      shell: cmd
+      run: call extras\scripts\build-libraw.bat
+
     # put this last since it takes the longest to build
     - name: libjxl
       if: ${{ steps.cache-bin.outputs.cache-hit != 'true' }}
diff --git a/extras/scripts/build-libraw.bat b/extras/scripts/build-libraw.bat
new file mode 100644
index 00000000..acaf518a
--- /dev/null
+++ b/extras/scripts/build-libraw.bat
@@ -0,0 +1,110 @@
+@echo off
+
+setlocal
+REM this builds LibRaw and replaces the dlls/libs in the JPEGView src folder
+
+SET XSRC_DIR=%~dp0..\..\src\JPEGView\libraw
+SET XLIB_DIR=%~dp0..\third_party\LibRaw
+
+SET XVS_VER=2019
+IF /I "%XVS_INIT_VER%" NEQ "" (
+	REM override the build version for the solutions provided
+	SET XVS_VER=%XVS_INIT_VER%
+)
+
+REM random name of a makefile that we're going to create / patch with options
+SET XMAKEFILE=Makefile.msvc-%RANDOM%
+SET XMF_PATH=%XLIB_DIR%\%XMAKEFILE%
+
+IF EXIST "%XMF_PATH%" (
+	echo ERROR: Random Makefile exists?  Shouldn't happen... reset submodule please!
+	exit /b 1
+)
+
+call :PATCH_LIBRAW_MAKEFILE
+IF ERRORLEVEL 1 exit /b 1
+
+call :BUILD_COPY_LIBRAW x86 ""
+IF ERRORLEVEL 1 exit /b 1
+
+call :BUILD_COPY_LIBRAW x64 "64"
+IF ERRORLEVEL 1 exit /b 1
+
+
+REM cleanup
+del "%XMAKEFILE%"
+
+
+echo === HEADER FILES NOT MAINTAINED BY SCRIPT ===
+echo NOTE: as for the header files, copy/replace files AS NEEDED
+echo;
+echo TO:   src\JPEGView\libraw\include
+echo FROM: extras\third_party\LibRaw\libraw
+
+exit /b 0
+
+
+
+
+REM ===============================================================================================
+
+:PATCH_LIBRAW_MAKEFILE
+
+REM patch the Makefile so that it has the options we need.  This only has to be done once
+
+echo + Patching Makefile with extra options ...
+
+setlocal
+
+pushd "%XLIB_DIR%"
+
+SET XTMP_FILE=%TEMP%\libraw-makefile-%RANDOM%-%RANDOM%.tmp
+
+IF EXIST "%XTMP_FILE%" (
+	echo ERROR: random temp file exists?!  impossible...
+	exit /b 1
+)
+
+REM -- add these options at the top --
+
+REM add in the extra features compile flags
+>> "%XTMP_FILE%" echo COPT_OPT=/DUSE_X3FTOOLS /DUSE_6BY9RPI /DUSE_OLD_VIDEOCAMS
+
+REM -- finally concat the file --
+
+copy "%XTMP_FILE%" /A + Makefile.msvc /A "%XMAKEFILE%" /A
+IF ERRORLEVEL 1 exit /b 1
+
+REM cleanup
+del "%XTMP_FILE%"
+
+popd
+
+exit /b 0
+
+
+REM ===============================================================================================
+
+:BUILD_COPY_LIBRAW
+
+REM so the environments don't pollute each other
+setlocal
+
+call "%~dp0vs-init.bat" %1
+
+pushd "%XLIB_DIR%"
+
+REM delete any previous build files, if exists
+nmake.exe -f "%XMAKEFILE%" clean
+IF ERRORLEVEL 1 exit /b 1
+
+nmake.exe -f "%XMAKEFILE%"
+IF ERRORLEVEL 1 exit /b 1
+
+
+copy /y "lib\libraw.lib" "%XSRC_DIR%\lib%~2"
+IF ERRORLEVEL 1 exit /b 1
+copy /y "bin\libraw.dll" "%XSRC_DIR%\bin%~2"
+IF ERRORLEVEL 1 exit /b 1
+
+exit /b 0