diff --git a/packages/functoria-runtime/functoria-runtime.dev~mirage/opam b/packages/functoria-runtime/functoria-runtime.dev~mirage/opam
new file mode 100644
index 00000000..d9aec312
--- /dev/null
+++ b/packages/functoria-runtime/functoria-runtime.dev~mirage/opam
@@ -0,0 +1,22 @@
+opam-version: "1.2"
+maintainer:   "Gabriel Radanne <drupyog@zoho.com>"
+authors:      [ "Thomas Gazagnaire"
+                "Anil Madhavapeddy"
+                "Dave Scott"
+                "Thomas Leonard"
+                "Gabriel Radanne" ]
+homepage:     "https://github.com/mirage/functoria"
+bug-reports:  "https://github.com/mirage/functoria/issues"
+dev-repo:     "https://github.com/mirage/functoria.git"
+doc:          "https://mirage.github.io/functoria/"
+license:      "ISC"
+
+build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%" ]
+depends: [
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg"     {build & >= "0.7.3"}
+  "cmdliner" {>= "0.9.8"}
+  "fmt"
+]
+available: [ocaml-version >= "4.02"]
diff --git a/packages/functoria-runtime/functoria-runtime.dev~mirage/url b/packages/functoria-runtime/functoria-runtime.dev~mirage/url
new file mode 100644
index 00000000..2e9c328f
--- /dev/null
+++ b/packages/functoria-runtime/functoria-runtime.dev~mirage/url
@@ -0,0 +1 @@
+git: "https://github.com/mirage/functoria.git"
diff --git a/packages/functoria/functoria.dev~mirage/opam b/packages/functoria/functoria.dev~mirage/opam
index 7407b1a2..81306446 100644
--- a/packages/functoria/functoria.dev~mirage/opam
+++ b/packages/functoria/functoria.dev~mirage/opam
@@ -1,5 +1,4 @@
 opam-version: "1.2"
-name:         "functoria"
 maintainer:   "Gabriel Radanne <drupyog@zoho.com>"
 authors:      [ "Thomas Gazagnaire"
                 "Anil Madhavapeddy"
@@ -12,13 +11,14 @@ dev-repo:     "https://github.com/mirage/functoria.git"
 doc:          "https://mirage.github.io/functoria/"
 license:      "ISC"
 
-build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "true"]
+build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%" "--tests" "false"]
 build-test: [
-  ["ocaml" "pkg/pkg.ml" "build" "--pinned" pinned "--tests" "true"]
+  ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%" "--tests" "true"]
   ["ocaml" "pkg/pkg.ml" "test"]
 ]
 depends: [
   "ocamlfind" {build}
+  "ocamlbuild" {build}
   "topkg"     {build & >= "0.7.3"}
   "base-unix"
   "cmdliner" {>= "0.9.8"}
@@ -28,4 +28,4 @@ depends: [
   "ocamlgraph"
   "ounit" {test}
 ]
-available: [ocaml-version >= "4.01"]
+available: [ocaml-version >= "4.02"]
diff --git a/packages/mirage-console-solo5/mirage-console-solo5.dev~mirage/opam b/packages/mirage-console-solo5/mirage-console-solo5.dev~mirage/opam
index 3c318fb8..2013ba1d 100644
--- a/packages/mirage-console-solo5/mirage-console-solo5.dev~mirage/opam
+++ b/packages/mirage-console-solo5/mirage-console-solo5.dev~mirage/opam
@@ -21,6 +21,7 @@ depends: [
   "topkg" {build}
   "mirage-types-lwt"
   "mirage-solo5"
+  "mirage-runtime"
   "cstruct"
   "lwt"
 ]
diff --git a/packages/mirage-console-unix/mirage-console-unix.dev~mirage/opam b/packages/mirage-console-unix/mirage-console-unix.dev~mirage/opam
index 79cc2f8c..2be928d4 100644
--- a/packages/mirage-console-unix/mirage-console-unix.dev~mirage/opam
+++ b/packages/mirage-console-unix/mirage-console-unix.dev~mirage/opam
@@ -18,4 +18,5 @@ depends: [
   "cstruct"
   "mirage-types-lwt" {>= "3.0.0"}
   "mirage-unix" {>="1.1.0"}
+  "mirage-runtime"
 ]
diff --git a/packages/mirage-console-xen-cli/mirage-console-xen-cli.dev~mirage/opam b/packages/mirage-console-xen-cli/mirage-console-xen-cli.dev~mirage/opam
index a6806c8b..dd71902e 100644
--- a/packages/mirage-console-xen-cli/mirage-console-xen-cli.dev~mirage/opam
+++ b/packages/mirage-console-xen-cli/mirage-console-xen-cli.dev~mirage/opam
@@ -18,6 +18,7 @@ depends: [
   "io-page"
   "mirage-types" {> "1.1.0"}
   "mirage-types-lwt" {>= "2.9.0"}
+  "mirage-runtime"
   "cmdliner"
   "mirage-unix" {>="1.1.0"}
   "xenstore_transport" "xenctrl" "xen-gnt"
diff --git a/packages/mirage-console-xen/mirage-console-xen.dev~mirage/opam b/packages/mirage-console-xen/mirage-console-xen.dev~mirage/opam
index e7ba1d83..a3a2a7a0 100644
--- a/packages/mirage-console-xen/mirage-console-xen.dev~mirage/opam
+++ b/packages/mirage-console-xen/mirage-console-xen.dev~mirage/opam
@@ -15,5 +15,7 @@ depends: [
   "ocamlbuild" {build}
   "topkg"      {build & >= "0.7.3"}
   "mirage-console-xen-proto"
+  "mirage-types-lwt"
+  "mirage-runtime"
   "xen-evtchn" "xen-gnt" "mirage-xen"
 ]
diff --git a/packages/mirage-runtime/mirage-runtime.dev~mirage/opam b/packages/mirage-runtime/mirage-runtime.dev~mirage/opam
new file mode 100644
index 00000000..a7c4bf42
--- /dev/null
+++ b/packages/mirage-runtime/mirage-runtime.dev~mirage/opam
@@ -0,0 +1,24 @@
+opam-version: "1.2"
+maintainer:   ["anil@recoil.org" "thomas@gazagnaire.org"]
+authors:      ["Thomas Gazagnaire" "Anil Madhavapeddy" "Gabriel Radanne"
+               "Mindy Preston" "Thomas Leonard" "Nicolas Ojeda Bar"
+               "Dave Scott" "David Kaloper" "Hannes Mehnert" "Richard Mortier"]
+homepage:     "https://mirage.io/"
+bug-reports:  "https://github.com/mirage/mirage/issues/"
+dev-repo:     "https://github.com/mirage/mirage.git"
+tags:         ["org:mirage" "org:xapi-project"]
+doc:          "https://mirage.github.io/mirage/"
+
+build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%"]
+
+depends: [
+  "ocamlbuild" {build}
+  "ocamlfind"  {build}
+  "topkg"      {build & >= "0.8.0"}
+  "ipaddr"             {>= "2.6.0"}
+  "functoria-runtime"
+  "astring"
+  "logs"
+  "mirage-types"
+]
+available: [ocaml-version >= "4.02.3"]
diff --git a/packages/mirage-runtime/mirage-runtime.dev~mirage/url b/packages/mirage-runtime/mirage-runtime.dev~mirage/url
new file mode 100644
index 00000000..b94d2dc7
--- /dev/null
+++ b/packages/mirage-runtime/mirage-runtime.dev~mirage/url
@@ -0,0 +1 @@
+git: "https://github.com/mirage/mirage.git"
diff --git a/packages/mirage-types/mirage-types.dev~mirage/opam b/packages/mirage-types/mirage-types.dev~mirage/opam
index c0b68fdc..63cb38a8 100644
--- a/packages/mirage-types/mirage-types.dev~mirage/opam
+++ b/packages/mirage-types/mirage-types.dev~mirage/opam
@@ -14,6 +14,7 @@ depends:   [
   "ocamlbuild" {build}
   "ocamlfind"  {build}
   "topkg"      {build & >= "0.8.0"}
+  "result"
 ]
 depopts: [ "lwt" "cstruct" "ipaddr" "io-page" ]
 conflicts: [
diff --git a/packages/mirage/mirage.dev~mirage/opam b/packages/mirage/mirage.dev~mirage/opam
index 6a0f39e5..c6c7ba39 100644
--- a/packages/mirage/mirage.dev~mirage/opam
+++ b/packages/mirage/mirage.dev~mirage/opam
@@ -15,10 +15,11 @@ depends: [
   "ocamlbuild" {build}
   "ocamlfind"  {build}
   "topkg"      {build & >= "0.8.0"}
-  "ipaddr"           {>= "2.6.0"}
-  "functoria"        {>= "1.1.0"}
+  "ipaddr"             {>= "2.6.0"}
+  "functoria"          {>= "1.1.0"}
   "astring"
   "logs"
+  "mirage-runtime"
 ]
 conflicts: [
   "nocrypto" {< "0.4.0"}
diff --git a/packages/tcpip/tcpip.dev~mirage/opam b/packages/tcpip/tcpip.dev~mirage/opam
index 83fed3c0..af635c4a 100644
--- a/packages/tcpip/tcpip.dev~mirage/opam
+++ b/packages/tcpip/tcpip.dev~mirage/opam
@@ -54,6 +54,7 @@ depends: [
   "alcotest" {test}
   "pcap-format" {test}
   "fmt"
+  "mirage-runtime"
   "mirage-stdlib-random" {test}
   "lwt" {>= "2.4.7"}
   "logs" {>= "0.6.0"}