diff --git a/lib_impl/freestanding/dune b/lib_impl/freestanding/dune
index 23ee7a3..6ce4da3 100644
--- a/lib_impl/freestanding/dune
+++ b/lib_impl/freestanding/dune
@@ -1,8 +1,8 @@
 (library
   (name        mirage_entropy_freestanding)
-  (public_name mirage-entropy-freestanding)
+  (public_name mirage-entropy.freestanding)
   (libraries   lwt cstruct mirage-solo5 ocaml-freestanding)
-  (implements mirage-entropy)
+  (implements  mirage-entropy)
   (c_names     entropy_cpu_stubs)
   (c_flags     (:include cflags.sexp) -O3 -std=c99 -Wall -Wpedantic
   )
diff --git a/lib_impl/unix/dune b/lib_impl/unix/dune
index 39681e1..ef1e60a 100644
--- a/lib_impl/unix/dune
+++ b/lib_impl/unix/dune
@@ -1,11 +1,11 @@
 (library
   (name        mirage_entropy_unix)
-  (public_name mirage-entropy-unix)
+  (public_name mirage-entropy.unix)
   (libraries   lwt cstruct mirage-unix)
   (implements  mirage-entropy)
   (c_names     entropy_cpu_stubs)
   (c_flags     (:include cflags.sexp) -O3 -std=c99 -Wall -Wpedantic
-  ) 
+  )
 )
 
 (rule (copy# ../entropy_cpu_stubs.c entropy_cpu_stubs.c))
diff --git a/lib_impl/xen/dune b/lib_impl/xen/dune
index e02a015..8aa7b12 100644
--- a/lib_impl/xen/dune
+++ b/lib_impl/xen/dune
@@ -1,11 +1,11 @@
 (library
   (name        mirage_entropy_xen)
-  (public_name mirage-entropy-xen)
+  (public_name mirage-entropy.xen)
   (libraries   lwt cstruct mirage-xen)
-  (implements mirage-entropy)
+  (implements  mirage-entropy)
   (c_names     entropy_cpu_stubs)
   (c_flags     (:include cflags.sexp) -O3 -std=c99 -Wall -Wpedantic
-  ) 
+  )
 )
 
 (rule (copy# ../entropy_cpu_stubs.c entropy_cpu_stubs.c))
diff --git a/mirage-entropy-freestanding.opam b/mirage-entropy-freestanding.opam
deleted file mode 100644
index 5747dd5..0000000
--- a/mirage-entropy-freestanding.opam
+++ /dev/null
@@ -1,33 +0,0 @@
-opam-version: "2.0"
-name:         "mirage-entropy-freestanding"
-homepage:     "https://github.com/mirage/mirage-entropy"
-dev-repo:     "git+https://github.com/mirage/mirage-entropy.git"
-bug-reports:  "https://github.com/mirage/mirage-entropy/issues"
-doc:          "https://mirage.github.io/mirage-entropy/doc"
-author:       ["Hannes Mehnert" "David Kaloper" "Anil Madhavapeddy" "Dave Scott"]
-maintainer:   "david@numm.org"
-license:      "BSD2"
-
-build: [ "dune" "build" "-p" "mirage-entropy-freestanding"]
-depends: [
-  "dune" {build}
-  "ocaml" {>= "4.04.2"}
-  "cstruct"
-  "ocaml-freestanding"
-  "mirage-entropy"
-  "mirage-solo5"
-  "lwt"
-]
-conflicts: [
-  "cstruct" {<"1.4.0"}
-]
-tags: [ "org:mirage"]
-available: [
-  arch = "arm" | arch = "x86_32" | arch = "x86_64" | arch = "arm64"
-]
-synopsis: "Entropy source for MirageOS unikernels"
-description: """
-mirage-entropy implements various entropy sources for MirageOS unikernels:
-- timer based ones (see [whirlwind RNG paper](https://www.ieee-security.org/TC/SP2014/papers/Not-So-RandomNumbersinVirtualizedLinuxandtheWhirlwindRNG.pdf))
-- rdseed and rdrand (x86/x86-64 only)
-"""
diff --git a/mirage-entropy-unix.opam b/mirage-entropy-unix.opam
deleted file mode 100644
index b2ca7d8..0000000
--- a/mirage-entropy-unix.opam
+++ /dev/null
@@ -1,32 +0,0 @@
-opam-version: "2.0"
-name:         "mirage-entropy-unix"
-homepage:     "https://github.com/mirage/mirage-entropy"
-dev-repo:     "git+https://github.com/mirage/mirage-entropy.git"
-bug-reports:  "https://github.com/mirage/mirage-entropy/issues"
-doc:          "https://mirage.github.io/mirage-entropy/doc"
-author:       ["Hannes Mehnert" "David Kaloper" "Anil Madhavapeddy" "Dave Scott"]
-maintainer:   "david@numm.org"
-license:      "BSD2"
-
-build: [ "dune" "build" "-p" "mirage-entropy-unix"]
-depends: [
-  "dune" {build}
-  "ocaml" {>= "4.04.2"}
-  "cstruct"
-  "lwt"
-  "mirage-entropy"
-  "mirage-unix"
-]
-conflicts: [
-  "cstruct" {<"1.4.0"}
-]
-tags: [ "org:mirage"]
-available: [
-  arch = "arm" | arch = "x86_32" | arch = "x86_64" | arch = "arm64"
-]
-synopsis: "Entropy source for MirageOS unikernels"
-description: """
-mirage-entropy implements various entropy sources for MirageOS unikernels:
-- timer based ones (see [whirlwind RNG paper](https://www.ieee-security.org/TC/SP2014/papers/Not-So-RandomNumbersinVirtualizedLinuxandtheWhirlwindRNG.pdf))
-- rdseed and rdrand (x86/x86-64 only)
-"""
diff --git a/mirage-entropy-xen.opam b/mirage-entropy-xen.opam
deleted file mode 100644
index 8271ddc..0000000
--- a/mirage-entropy-xen.opam
+++ /dev/null
@@ -1,33 +0,0 @@
-opam-version: "2.0"
-name:         "mirage-entropy-xen"
-homepage:     "https://github.com/mirage/mirage-entropy"
-dev-repo:     "git+https://github.com/mirage/mirage-entropy.git"
-bug-reports:  "https://github.com/mirage/mirage-entropy/issues"
-doc:          "https://mirage.github.io/mirage-entropy/doc"
-author:       ["Hannes Mehnert" "David Kaloper" "Anil Madhavapeddy" "Dave Scott"]
-maintainer:   "david@numm.org"
-license:      "BSD2"
-
-build: [ "dune" "build" "-p" "mirage-entropy-xen"]
-depends: [
-  "dune" {build}
-  "ocaml" {>= "4.04.2"}
-  "cstruct"
-  "mirage-xen"
-  "mirage-entropy"
-  "lwt"
-]
-conflicts: [
-  "cstruct" {<"1.4.0"}
-  "mirage-xen" {<"2.2.0"}
-]
-tags: [ "org:mirage"]
-available: [
-  arch = "arm" | arch = "x86_32" | arch = "x86_64" | arch = "arm64"
-]
-synopsis: "Entropy source for MirageOS unikernels"
-description: """
-mirage-entropy implements various entropy sources for MirageOS unikernels:
-- timer based ones (see [whirlwind RNG paper](https://www.ieee-security.org/TC/SP2014/papers/Not-So-RandomNumbersinVirtualizedLinuxandtheWhirlwindRNG.pdf))
-- rdseed and rdrand (x86/x86-64 only)
-"""
diff --git a/mirage-entropy.opam b/mirage-entropy.opam
index d8b1829..20f7023 100644
--- a/mirage-entropy.opam
+++ b/mirage-entropy.opam
@@ -15,6 +15,12 @@ depends: [
   "cstruct"
   "lwt"
 ]
+depopts: [
+  "mirage-solo5"
+  "ocaml-freestanding"
+  "mirage-unix"
+  "mirage-xen"
+]
 conflicts: [
   "cstruct" {<"1.4.0"}
 ]