diff --git a/dune-project b/dune-project
index 9eacad98..bf605b53 100644
--- a/dune-project
+++ b/dune-project
@@ -2,16 +2,27 @@
 
 (name mirageio)
 
-(documentation "https://tmattio.github.io/mirageio/")
+(documentation "https://mirage.github.io/mirage-www/")
 
 (source
- (github tmattio/mirageio))
+ (github mirage/mirage-www))
 
 (license ISC)
 
-(authors "Thibaut Mattio")
-
-(maintainers "Thibaut Mattio")
+(authors
+  "Anil Madhavapeddy"
+  "Amir Chaudhry"
+  "Thomas Gazagnaire"
+  "Richard Mortier"
+  "Hannes Mehnert"
+  "Mindy Preston"
+  "Lucas Pluvinage"
+  "Thomas Leonard"
+  "Dave Scott"
+  "Martin Keegan"
+  "Thibaut Mattio")
+
+(maintainers "mirageos-devel@list.xenproject.org")
 
 (generate_opam_files true)
 
@@ -29,20 +40,8 @@
   mirage-clock-unix
   mirage-unix
   (tailwindcss :build)
-  (crunch :build)
+  (crunch (and :build (>= 3.1.0)))
   (omd :build)
   (yaml :build)
   (fmt :build)
   (ppx_deriving_yaml :build)))
-
-(package
- (name mirageio-bin)
- (synopsis "Unix binary for the mirage.io website")
- (description "Unix binary for the mirage.io website")
- (depends
-  (ocaml (>= 4.08.0))
-  dune
-  mirageio
-  mirage-clock-unix
-  mirage-unix
-  (tcpip (>= 7.0.0))))
\ No newline at end of file
diff --git a/mirageio-bin.opam b/mirageio-bin.opam
deleted file mode 100644
index f4cbb12f..00000000
--- a/mirageio-bin.opam
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is generated by dune, edit dune-project instead
-opam-version: "2.0"
-synopsis: "Unix binary for the mirage.io website"
-description: "Unix binary for the mirage.io website"
-maintainer: ["Thibaut Mattio"]
-authors: ["Thibaut Mattio"]
-license: "ISC"
-homepage: "https://github.com/tmattio/mirageio"
-doc: "https://tmattio.github.io/mirageio/"
-bug-reports: "https://github.com/tmattio/mirageio/issues"
-depends: [
-  "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.7"}
-  "mirageio"
-  "mirage-clock-unix"
-  "mirage-unix"
-  "tcpip" {>= "7.0.0"}
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/tmattio/mirageio.git"
diff --git a/mirageio.opam b/mirageio.opam
index d22edb81..5717e571 100644
--- a/mirageio.opam
+++ b/mirageio.opam
@@ -2,12 +2,24 @@
 opam-version: "2.0"
 synopsis: "Website infrastructure and content for mirage.io"
 description: "Website infrastructure and content for mirage.io"
-maintainer: ["Thibaut Mattio"]
-authors: ["Thibaut Mattio"]
+maintainer: ["mirageos-devel@list.xenproject.org"]
+authors: [
+  "Anil Madhavapeddy"
+  "Amir Chaudhry"
+  "Thomas Gazagnaire"
+  "Richard Mortier"
+  "Hannes Mehnert"
+  "Mindy Preston"
+  "Lucas Pluvinage"
+  "Thomas Leonard"
+  "Dave Scott"
+  "Martin Keegan"
+  "Thibaut Mattio"
+]
 license: "ISC"
-homepage: "https://github.com/tmattio/mirageio"
-doc: "https://tmattio.github.io/mirageio/"
-bug-reports: "https://github.com/tmattio/mirageio/issues"
+homepage: "https://github.com/mirage/mirage-www"
+doc: "https://mirage.github.io/mirage-www/"
+bug-reports: "https://github.com/mirage/mirage-www/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "dune" {>= "2.7"}
@@ -38,7 +50,7 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/tmattio/mirageio.git"
+dev-repo: "git+https://github.com/mirage/mirage-www.git"
 pin-depends: [
   ["dream.dev" "git+https://github.com/TheLortex/dream.git#e8ba8e4c6c8689e0e568153fd908369fb8303d53"] # branch mirage-alpha4
   ["dream-mirage.dev" "git+https://github.com/TheLortex/dream.git#e8ba8e4c6c8689e0e568153fd908369fb8303d53"]