diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 85f47ef..3cd43f8 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -17,7 +17,10 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,   r: 'release'}
+          - {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'release'}
+          - {os: windows-latest, r: '4.2'}
+          - {os: windows-latest, r: '4.1'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'oldrel-1'}
@@ -27,7 +30,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-pandoc@v2
 
diff --git a/src/Makevars b/src/Makevars
index 34bfafa..d5ec9e2 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -8,9 +8,6 @@ LIBUNRTF = \
 
 UNRTF = unrtf$(WIN)
 
-# On Windows we need to link Riconv and winsock
-WINFLAGS = $(subst 64,-lws2_32 $(LIBR) -lRiconv,$(subst 32,64,$(WIN)))
-
 # Workaround for MacOS R 4.0 harding pcre2
 SYSLIBS = $(subst -lpcre2-8,,$(LIBS))
 
diff --git a/src/Makevars.win b/src/Makevars.win
new file mode 100644
index 0000000..0b47ade
--- /dev/null
+++ b/src/Makevars.win
@@ -0,0 +1,2 @@
+WINFLAGS = -lws2_32 $(LIBR) -lRiconv
+include Makevars