diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
index 01663c4..5276fb1 100644
--- a/.github/workflows/ffmpeg.yml
+++ b/.github/workflows/ffmpeg.yml
@@ -100,7 +100,7 @@ jobs:
           cd temp
           cmake.exe -G "Visual Studio 16 2019" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
           MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.winConfig }} -m oneVPL.sln
-          D:\a\_temp\setup-msys2\msys2.cmd -c 'cd build ; tar czf ../dist/onevpl.tgz *'
+          D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ../build ; tar czf ../dist/onevpl.tgz *'
       - name: Publish artifact
         uses: actions/upload-artifact@v2
         with:
@@ -112,7 +112,51 @@ jobs:
     runs-on: windows-2019
     steps:
     - name: Set up MSYS2
-      run: echo "bla"
+      uses: msys2/setup-msys2@v2
+      with:
+        install: base-devel binutils autotools automake
+        path-type: inherit
+    - name: Set up cache
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-ffmpeg-${{ env.msysConfig }}
+      with:
+        path: cache
+        key: cache-key
+    - name: Set up GIT
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - name: Checkout Ogg
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: xiph/ogg
+        ref: master
+        path: ogg
+    - name: Checkout Vorbis
+      uses: actions/checkout@v3.0.0
+      with:
+        repository: xiph/vorbis
+        ref: master
+        path: vorbis
+    - name: Build Ogg
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md build
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ogg ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install'
+    - name: Build Vorbis
+      shell: cmd
+      run: |
+        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+        md dist
+        D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vorbis ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install ; sed -i '/^Libs\.private.*/d' ../build/lib/pkgconfig/vorbis.pc ; cd ../build ; tar czf ../dist/liboggvorbis.tgz *'
+        echo "switches=${{env.switches}} --enable-encoder=libopus --enable-encoder=libvorbis" >> $GITHUB_ENV
+    - name: Publish artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: liboggvorbis
+        path: dist/liboggvorbis.tgz
        
   libsnappy:
     if: ${{ false }}