diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh
index b1162a981..e13cf0f19 100755
--- a/.github/scripts/Linux/prepare.sh
+++ b/.github/scripts/Linux/prepare.sh
@@ -65,7 +65,7 @@ fi
 if [ -n "$SDK_URL" -a "$GITHUB_REF" = refs/heads/ndi-build ]; then
         curl -f -S $SDK_URL/NDISDK_Linux.tar.gz -O
         tar -C /var/tmp -xzf NDISDK_Linux.tar.gz
-        yes | PAGER=cat /var/tmp/InstallNDI*sh
+        yes | PAGER=cat /var/tmp/Install*NDI*sh
 	sudo cp -r NDI\ SDK\ for\ Linux/include/* /usr/local/include
 	cat NDI\ SDK\ for\ Linux/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | sudo tee /usr/local/include/ndi_version.h
 	sudo cp -r NDI\ SDK\ for\ Linux/lib/x86_64-linux-gnu/* /usr/local/lib
diff --git a/.github/scripts/Windows/prepare.ps1 b/.github/scripts/Windows/prepare.ps1
index f61ff8a08..8a683ef06 100644
--- a/.github/scripts/Windows/prepare.ps1
+++ b/.github/scripts/Windows/prepare.ps1
@@ -25,8 +25,8 @@ if (${env:SDK_URL} -and ${env:GITHUB_REF} -eq "refs/heads/ndi-build") {
   #Start-Process -FilePath "C:\ndi.exe" -ArgumentList "/VERYSILENT" -Wait -NoNewWindow
   Start-Process -FilePath "C:\ndi.exe" -ArgumentList "/VERYSILENT"
   Sleep 10
-  $sdk=(dir "C:\Program Files\NewTek" -Filter *SDK -Name)
-  echo "C:\Program Files\NewTek\$sdk\Bin\x64" >> ${env:GITHUB_PATH}
+  $sdk=(dir "C:\Program Files\NDI" -Filter *SDK -Name)
+  echo "C:\Program Files\NDI\$sdk\Bin\x64" >> ${env:GITHUB_PATH}
   #Remove-Item C:\ndi.exe
 }
 
diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh
index 354663da0..960254a6e 100644
--- a/.github/scripts/Windows/prepare_msys.sh
+++ b/.github/scripts/Windows/prepare_msys.sh
@@ -15,8 +15,8 @@ if test -d "$CUDA_D"; then
         export CPATH=$CPATH:$CUDA_D/include
 fi
 
-if test -d /c/Program\ Files/NewTek; then
-        NDI_D=$(ls -d /c/Program\ Files/NewTek/*SDK)
+if test -d /c/Program\ Files/NDI; then
+        NDI_D=$(ls -d /c/Program\ Files/NDI/*SDK)
         export CPATH=$CPATH:$NDI_D/Include
         export LIBRARY_PATH=$LIBRARY_PATH:$NDI_D/Lib/x64
         cat $NDI_D/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | tee /usr/local/include/ndi_version.h
diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh
index 7c734605c..27701f664 100755
--- a/.github/scripts/macOS/prepare.sh
+++ b/.github/scripts/macOS/prepare.sh
@@ -55,14 +55,19 @@ fi
 # Install NDI
 if [ -f $SDK_NONFREE_PATH/NDISDK_Apple.pkg  ]; then
         sudo installer -pkg $SDK_NONFREE_PATH/NDISDK_Apple.pkg -target /
-        sudo mv "/Library/NDI SDK for Apple/" /Library/NDI
+        sudo mv /Library/NDI\ SDK\ for\ * /Library/NDI
         cat /Library/NDI/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | sudo tee /usr/local/include/ndi_version.h
-        cd /Library/NDI/lib/x64
-        sudo ln -s libndi.?.dylib libndi.dylib
+        if [ -d /Library/NDI/lib/x64 ]; then # NDI 4
+                cd /Library/NDI/lib/x64
+                sudo ln -s libndi.?.dylib libndi.dylib
+                NDI_LIB=/Library/NDI/lib/x64
+        else # NDI 5
+                NDI_LIB=/Library/NDI/lib/macOS
+        fi
         export CPATH=${CPATH:+"$CPATH:"}/Library/NDI/include
-        export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s /Library/NDI/lib/x64"
-        export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}/Library/NDI/lib/x64
-        export MY_DYLD_LIBRARY_PATH="${MY_DYLD_LIBRARY_PATH:+$MY_DYLD_LIBRARY_PATH:}/Library/NDI/lib/x64"
+        export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s $NDI_LIB"
+        export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}$NDI_LIB
+        export MY_DYLD_LIBRARY_PATH="${MY_DYLD_LIBRARY_PATH:+$MY_DYLD_LIBRARY_PATH:}$NDI_LIB"
         echo "CPATH=$CPATH" >> $GITHUB_ENV
         echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> $GITHUB_ENV
         echo "LIBRARY_PATH=$LIBRARY_PATH" >> $GITHUB_ENV