diff --git a/README.md b/README.md
index aa5ef318..65f97bbf 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ awk/sed-style assembly.
 ocaml-dockerfile is distributed under the ISC license.
 
 - **HTML Documentation**: <http://anil-code.recoil.org/ocaml-dockerfile>
-- **Source:**: <https://github.com/avsm/ocaml-dockerfile>
-- **Issues**: <https://github.com/avsm/ocaml-dockerfile/issues>
+- **Source:**: <https://github.com/ocurrent/ocaml-dockerfile>
+- **Issues**: <https://github.com/ocurrent/ocaml-dockerfile/issues>
 - **Email**: <anil@recoil.org>
 
 ## Installation
diff --git a/dockerfile-cmd.opam b/dockerfile-cmd.opam
index 9ada59a4..1be93664 100644
--- a/dockerfile-cmd.opam
+++ b/dockerfile-cmd.opam
@@ -11,9 +11,9 @@ maintainer: "Anil Madhavapeddy <anil@recoil.org>"
 authors: "Anil Madhavapeddy <anil@recoil.org>"
 license: "ISC"
 tags: ["org:mirage" "org:ocamllabs"]
-homepage: "https://github.com/avsm/ocaml-dockerfile"
-doc: "https://avsm.github.io/ocaml-dockerfile/doc"
-bug-reports: "https://github.com/avsm/ocaml-dockerfile/issues"
+homepage: "https://github.com/ocurrent/ocaml-dockerfile"
+doc: "https://ocurrent.github.io/ocaml-dockerfile/doc"
+bug-reports: "https://github.com/ocurrent/ocaml-dockerfile/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "dune" {>= "2.0.0"}
@@ -29,4 +29,4 @@ build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-dev-repo: "git+https://github.com/avsm/ocaml-dockerfile.git"
+dev-repo: "git+https://github.com/ocurrent/ocaml-dockerfile.git"
diff --git a/dockerfile-opam.opam b/dockerfile-opam.opam
index 1aedc1c6..c4ef79bf 100644
--- a/dockerfile-opam.opam
+++ b/dockerfile-opam.opam
@@ -14,9 +14,9 @@ authors: [
 ]
 license: "ISC"
 tags: ["org:mirage" "org:ocamllabs"]
-homepage: "https://github.com/avsm/ocaml-dockerfile"
-doc: "https://avsm.github.io/ocaml-dockerfile/doc"
-bug-reports: "https://github.com/avsm/ocaml-dockerfile/issues"
+homepage: "https://github.com/ocurrent/ocaml-dockerfile"
+doc: "https://ocurrent.github.io/ocaml-dockerfile/doc"
+bug-reports: "https://github.com/ocurrent/ocaml-dockerfile/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "dune" {>= "2.0.0"}
@@ -32,4 +32,4 @@ build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-dev-repo: "git+https://github.com/avsm/ocaml-dockerfile.git"
+dev-repo: "git+https://github.com/ocurrent/ocaml-dockerfile.git"
diff --git a/dockerfile.opam b/dockerfile.opam
index 0342fef0..a3510112 100644
--- a/dockerfile.opam
+++ b/dockerfile.opam
@@ -8,9 +8,9 @@ maintainer: "Anil Madhavapeddy <anil@recoil.org>"
 authors: "Anil Madhavapeddy <anil@recoil.org>"
 license: "ISC"
 tags: ["org:mirage" "org:ocamllabs"]
-homepage: "https://github.com/avsm/ocaml-dockerfile"
-doc: "https://avsm.github.io/ocaml-dockerfile/doc"
-bug-reports: "https://github.com/avsm/ocaml-dockerfile/issues"
+homepage: "https://github.com/ocurrent/ocaml-dockerfile"
+doc: "https://ocurrent.github.io/ocaml-dockerfile/doc"
+bug-reports: "https://github.com/ocurrent/ocaml-dockerfile/issues"
 depends: [
   "ocaml" {>= "4.02.3"}
   "dune" {>= "2.0.0"}
@@ -22,4 +22,4 @@ build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-dev-repo: "git+https://github.com/avsm/ocaml-dockerfile.git"
+dev-repo: "git+https://github.com/ocurrent/ocaml-dockerfile.git"