4 files changed, 5 insertions, 5 deletions
diff --git a/deployment/portable/docker-build.sh b/deployment/portable/docker-build.sh
index 3645522d1..0cc6e84f0 100755
--- a/deployment/portable/docker-build.sh
+++ b/deployment/portable/docker-build.sh
@@ -26,7 +26,7 @@ rm -rf ${web_build_dir}
 version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
 
 # Build archives
-dotnet publish --configuration Release --self-contained --runtime framework --output /dist/jellyfin_${version}/ "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none"
+dotnet publish --configuration Release --output /dist/jellyfin_${version}/ "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none"
 tar -cvzf /jellyfin_${version}.portable.tar.gz -C /dist jellyfin_${version}
 rm -rf /dist/jellyfin_${version}
 
diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh
index 36d6f77fc..20bf430c8 100755
--- a/deployment/win-x64/docker-build.sh
+++ b/deployment/win-x64/docker-build.sh
@@ -51,7 +51,7 @@ cp ${SOURCE_DIR}/deployment/windows/legacy/install.bat /dist/jellyfin_${version}
 
 # Create zip package
 pushd /dist
-zip /jellyfin_${version}.portable.zip jellyfin_${version}
+zip -r /jellyfin_${version}.portable.zip jellyfin_${version}
 popd
 rm -rf /dist/jellyfin_${version}
 
diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh
index 86ede7452..c5f6e82e7 100755
--- a/deployment/win-x86/docker-build.sh
+++ b/deployment/win-x86/docker-build.sh
@@ -51,7 +51,7 @@ cp ${SOURCE_DIR}/deployment/windows/legacy/install.bat /dist/jellyfin_${version}
 
 # Create zip package
 pushd /dist
-zip /jellyfin_${version}.portable.zip jellyfin_${version}
+zip -r /jellyfin_${version}.portable.zip jellyfin_${version}
 popd
 rm -rf /dist/jellyfin_${version}
 
diff --git a/deployment/windows/build-jellyfin.ps1 b/deployment/windows/build-jellyfin.ps1
index 454c89bf6..c4fb4b995 100644
--- a/deployment/windows/build-jellyfin.ps1
+++ b/deployment/windows/build-jellyfin.ps1
@@ -51,7 +51,7 @@ function Install-FFMPEG {
         Write-Warning "FFMPEG will not be installed"
     }elseif($Architecture -eq 'x64'){
          Write-Verbose "Downloading 64 bit FFMPEG"
-         Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.0.2-win64-shared.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose
+         Invoke-WebRequest -Uri https://repo.jellyfin.org/releases/server/windows/ffmpeg/jellyfin-ffmpeg.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose
     }else{
          Write-Verbose "Downloading 32 bit FFMPEG"
          Invoke-WebRequest -Uri https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.0.2-win32-shared.zip -UseBasicParsing -OutFile "$tempdir/ffmpeg.zip" | Write-Verbose
@@ -60,7 +60,7 @@ function Install-FFMPEG {
     Expand-Archive "$tempdir/ffmpeg.zip" -DestinationPath "$tempdir/ffmpeg/" -Force | Write-Verbose
     if($Architecture -eq 'x64'){
         Write-Verbose "Copying Binaries to Jellyfin location"
-        Get-ChildItem "$tempdir/ffmpeg/ffmpeg-4.0.2-win64-shared/bin" | ForEach-Object {
+        Get-ChildItem "$tempdir/ffmpeg" | ForEach-Object {
             Copy-Item $_.FullName -Destination $installLocation | Write-Verbose
         }
     }else{