diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e9c8d3013..b3a637010 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -27,7 +27,7 @@ jobs:
         new-dynarec: ['y', 'n']
 
     steps:
-    - uses: msys2/setup-msys2@v1
+    - uses: msys2/setup-msys2@v2
       with:
         update: true
         msystem: MINGW32
diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c
index b3d7500d4..7a3a0619b 100644
--- a/src/printer/prt_ps.c
+++ b/src/printer/prt_ps.c
@@ -140,7 +140,7 @@ convert_to_pdf(ps_t *dev)
 
     output_fn[0] = 0;
     wcscat(output_fn, input_fn);
-    wcscpy(output_fn + wcslen(output_fn) - 4, L".pdf");
+    wcscpy(output_fn + wcslen(output_fn) - 3, L".pdf");
 
     gsargv[0] = L"";
     gsargv[1] = L"-dNOPAUSE";
@@ -201,7 +201,7 @@ write_buffer(ps_t *dev, bool newline)
     }
 
     if (dev->filename[0] == 0) {
-	plat_tempfile(dev->filename, NULL, L".tmp");
+	plat_tempfile(dev->filename, NULL, L".ps");
     }
 
     path[0] = 0;