diff --git a/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/descr b/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/descr
deleted file mode 100644
index fa024058e..000000000
--- a/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/descr
+++ /dev/null
@@ -1 +0,0 @@
-MirageOS entropy device
diff --git a/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/opam b/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/opam
deleted file mode 100644
index 3c8e37562..000000000
--- a/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/opam
+++ /dev/null
@@ -1,23 +0,0 @@
-opam-version: "1.2"
-name:         "mirage-entropy-solo5"
-homepage:     "https://github.com/mirage/mirage-entropy"
-dev-repo:     "https://github.com/mirage/mirage-entropy.git"
-bug-reports:  "https://github.com/mirage/mirage-entropy/issues"
-author:       ["Hannes Mehnert" "David Kaloper" "Anil Madhavapeddy" "Dave Scott"]
-maintainer:   "david@numm.org"
-license:      "BSD2"
-
-build: [
-  ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "true"]
-]
-depends: [
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.7.6"}
-  "cstruct" {>= "1.4.0"}
-  "lwt"
-  "mirage-solo5"
-  "ocaml-freestanding"
-]
-tags: [ "org:mirage"]
-available: [ ocaml-version >= "4.01.0" ]
diff --git a/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/url b/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/url
deleted file mode 100644
index 79daf2fb6..000000000
--- a/packages/mirage-entropy-solo5/mirage-entropy-solo5.dev~mirage/url
+++ /dev/null
@@ -1 +0,0 @@
-git: "git://github.com/mirage/mirage-entropy.git"
diff --git a/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/descr b/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/descr
deleted file mode 100644
index fa024058e..000000000
--- a/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/descr
+++ /dev/null
@@ -1 +0,0 @@
-MirageOS entropy device
diff --git a/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/opam b/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/opam
deleted file mode 100644
index 08d2da231..000000000
--- a/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/opam
+++ /dev/null
@@ -1,22 +0,0 @@
-opam-version: "1.2"
-name:         "mirage-entropy-xen"
-homepage:     "https://github.com/mirage/mirage-entropy"
-dev-repo:     "https://github.com/mirage/mirage-entropy.git"
-bug-reports:  "https://github.com/mirage/mirage-entropy/issues"
-author:       ["Hannes Mehnert" "David Kaloper" "Anil Madhavapeddy" "Dave Scott"]
-maintainer:   "david@numm.org"
-license:      "BSD2"
-
-build: [
-  ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%"]
-]
-depends: [
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.7.6"}
-  "cstruct" {>= "1.4.0"}
-  "lwt"
-  "mirage-xen" {>="2.2.0"}
-]
-tags: [ "org:mirage"]
-available: [ ocaml-version >= "4.01.0" ]
diff --git a/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/url b/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/url
deleted file mode 100644
index 79daf2fb6..000000000
--- a/packages/mirage-entropy-xen/mirage-entropy-xen.dev~mirage/url
+++ /dev/null
@@ -1 +0,0 @@
-git: "git://github.com/mirage/mirage-entropy.git"
diff --git a/packages/mirage-vnetif/mirage-vnetif.dev~mirage/url b/packages/mirage-vnetif/mirage-vnetif.dev~mirage/url
index 526d76a85..78e001b1f 100644
--- a/packages/mirage-vnetif/mirage-vnetif.dev~mirage/url
+++ b/packages/mirage-vnetif/mirage-vnetif.dev~mirage/url
@@ -1 +1 @@
-git: "https://github.com/magnuss/mirage-vnetif.git"
+git: "https://github.com/hannesm/mirage-vnetif.git#use-result"