diff --git a/packages/conf-cairo/conf-cairo.1/opam b/packages/conf-cairo/conf-cairo.1/opam
index 08146c63a0c3..4ec09d85332d 100644
--- a/packages/conf-cairo/conf-cairo.1/opam
+++ b/packages/conf-cairo/conf-cairo.1/opam
@@ -4,13 +4,18 @@ homepage: "http://cairographics.org/"
 authors: ["Keith Packard" "Carl Worth" "Behdad Esfahbod"]
 license: ["LGPL-2.1-only" "MPL-1.1"]
 build: [
+  ["pkgconf" "--personality=i686-w64-mingw32" "cairo"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
+  ["pkgconf" "--personality=x86_64-w64-mingw32" "cairo"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
   ["pkg-config" "cairo"] {os != "macos" & os != "win32"}
-  ["pkgconf" "--cflags" "cairo"] {os = "win32" & os-distribution != "msys2"}
   ["sh" "-exc"
    "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/; pkg-config --libs cairo"]
    {os = "macos" & os-distribution = "homebrew"}
 ]
-depends: ["conf-pkg-config" {>= "3" & build}]
+depends: [
+  "conf-pkg-config" {>= "3" & build}
+  ("host-arch-x86_32" {os = "win32" & os-distribution != "cygwinports"} & "conf-mingw-w64-cairo-i686" {os = "win32" & os-distribution != "cygwinports"} |
+   "host-arch-x86_64" {os = "win32" & os-distribution != "cygwinports"} & "conf-mingw-w64-cairo-x86_64" {os = "win32" & os-distribution != "cygwinports"})
+]
 depexts: [
   ["libcairo2-dev"] {os-family = "debian"}
   ["libcairo2-dev"] {os-family = "ubuntu"}
@@ -25,7 +30,7 @@ depexts: [
   ["cairo"] {os-family = "arch"}
   ["cairo"] {os = "macos" & os-distribution = "homebrew"}
   ["cairo"] {os = "win32" & os-distribution = "cygwinports"}
-  ["libcairo-devel"] {os = "win32" & os-distribution = "cygwin"}
+  ["libcairo-devel"] {os = "cygwin"}
 ]
 synopsis: "Virtual package relying on a Cairo system installation"
 description:
diff --git a/packages/conf-mingw-w64-cairo-i686/conf-mingw-w64-cairo-i686.1/opam b/packages/conf-mingw-w64-cairo-i686/conf-mingw-w64-cairo-i686.1/opam
new file mode 100644
index 000000000000..a2fea34dbe7d
--- /dev/null
+++ b/packages/conf-mingw-w64-cairo-i686/conf-mingw-w64-cairo-i686.1/opam
@@ -0,0 +1,19 @@
+opam-version: "2.0"
+synopsis: "Provides cairo for i686 mingw-w64 (32-bit x86)"
+description: "Ensure that the i686 version of cairo for the mingw-w64 project is available"
+maintainer: "https://github.com/ocaml/opam-repository/issues"
+authors: ["Keith Packard" "Carl Worth" "Behdad Esfahbod"]
+license: ["LGPL-2.1-only" "MPL-1.1"]
+homepage: "http://cairographics.org/"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+flags: conf
+available: os = "win32"
+build: ["pkgconf" "--personality=i686-w64-mingw32" "cairo"]
+depends: [
+  "conf-pkg-config" {build}
+  "conf-mingw-w64-gcc-i686" {build}
+]
+depexts: [
+  ["mingw64-i686-cairo"] {os = "win32" & os-distribution = "cygwin"}
+  ["mingw-w64-i686-cairo"] {os = "win32" & os-distribution = "msys2"}
+]
diff --git a/packages/conf-mingw-w64-cairo-x86_64/conf-mingw-w64-cairo-x86_64.1/opam b/packages/conf-mingw-w64-cairo-x86_64/conf-mingw-w64-cairo-x86_64.1/opam
new file mode 100644
index 000000000000..aa6db2556852
--- /dev/null
+++ b/packages/conf-mingw-w64-cairo-x86_64/conf-mingw-w64-cairo-x86_64.1/opam
@@ -0,0 +1,19 @@
+opam-version: "2.0"
+synopsis: "Provides cairo for x86_64 mingw-w64 (64-bit x86_64)"
+description: "Ensure that the x86_64 version of cairo for the mingw-w64 project is available"
+maintainer: "https://github.com/ocaml/opam-repository/issues"
+authors: ["Keith Packard" "Carl Worth" "Behdad Esfahbod"]
+license: ["LGPL-2.1-only" "MPL-1.1"]
+homepage: "http://cairographics.org/"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+flags: conf
+available: os = "win32"
+build: ["pkgconf" "--personality=x86_64-w64-mingw32" "cairo"]
+depends: [
+  "conf-pkg-config" {build}
+  "conf-mingw-w64-gcc-x86_64" {build}
+]
+depexts: [
+  ["mingw64-x86_64-cairo"] {os = "win32" & os-distribution = "cygwin"}
+  ["mingw-w64-x86_64-cairo"] {os = "win32" & os-distribution = "msys2"}
+]