diff --git a/README.md b/README.md
index 6ff94445..75046b40 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ jbuilder.
 
 [manual]:         https://jbuilder.readthedocs.io/en/latest/
 [quick-start]:    https://jbuilder.readthedocs.io/en/latest/quick-start.html
-[example]:        https://github.com/janestreet/jbuilder/tree/master/example
+[example]:        https://github.com/ocaml/dune/tree/master/example
 [travis]:         https://travis-ci.org/ocaml/dune
 [travis-img]:     https://travis-ci.org/ocaml/dune.svg?branch=master
 [appveyor]:       https://ci.appveyor.com/project/diml/dune/branch/master
@@ -31,7 +31,7 @@ jbuilder.
 [merlin]:         https://github.com/ocaml/merlin
 [opam]:           https://opam.ocaml.org
 [jenga]:          https://github.com/janestreet/jenga
-[issues]:         https://github.com/janestreet/jbuilder/issues
+[issues]:         https://github.com/ocaml/dune/issues
 [topkg-jbuilder]: https://github.com/diml/topkg-jbuilder
 [video]:          https://youtu.be/BNZhmMAJarw
 
@@ -192,7 +192,7 @@ Known issues
 
 ### Optional libraries inside a multilib directory
 
-https://github.com/janestreet/jbuilder/issues/51
+https://github.com/ocaml/dune/issues/51
 
 If a directory contains several libraries and some are marked as
 optional (by adding `(optional)` in the `(library ...)` stanza), then
@@ -207,7 +207,7 @@ Put each optional library in a separate directory.
 
 ### mli only modules
 
-https://github.com/janestreet/jbuilder/issues/9
+https://github.com/ocaml/dune/issues/9
 
 Due to the low-level details of OCaml compilation, it is currently
 possible to write a module that has only a `.mli` and no `.ml`
diff --git a/ROADMAP.md b/ROADMAP.md
index d54084ea..f1a678ff 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -67,7 +67,7 @@ documentation.
 
 So that we can filter tests when using `-p pkg`
 
-- *05/02/2017*: Rudi Grinberg added this ([[https://github.com/janestreet/jbuilder/pull/64][#64]])
+- *05/02/2017*: Rudi Grinberg added this ([[https://github.com/ocaml/dune/pull/64][#64]])
 
 ## ~~Integrate rules for js_of_ocaml~~
 
diff --git a/bin/main.ml b/bin/main.ml
index a0d5efb5..b8c529da 100644
--- a/bin/main.ml
+++ b/bin/main.ml
@@ -155,7 +155,7 @@ let help_secs =
   ; `S "MORE HELP"
   ; `P "Use `$(mname) $(i,COMMAND) --help' for help on a single command."
   ; `S "BUGS"
-  ; `P "Check bug reports at https://github.com/janestreet/jbuilder/issues"
+  ; `P "Check bug reports at https://github.com/ocaml/dune/issues"
   ]
 
 let common =
diff --git a/doc/jbuild.rst b/doc/jbuild.rst
index 78d3c857..c6984bda 100644
--- a/doc/jbuild.rst
+++ b/doc/jbuild.rst
@@ -1208,7 +1208,7 @@ If a ``jbuild`` file starts with ``(* -*- tuareg -*- *)``, then it is
 interpreted as an OCaml script that generates the ``jbuild`` file as described
 in the rest of this section. The code in the script will have access to a
 `Jbuild_plugin
-<https://github.com/janestreet/jbuilder/blob/master/plugin/jbuild_plugin.mli>`__
+<https://github.com/ocaml/dune/blob/master/plugin/jbuild_plugin.mli>`__
 module containing details about the build context it is executed in.
 
 The OCaml syntax gives you an escape hatch for when the S-expression
diff --git a/doc/quick-start.rst b/doc/quick-start.rst
index 7dcaa827..fc8fb280 100644
--- a/doc/quick-start.rst
+++ b/doc/quick-start.rst
@@ -3,7 +3,7 @@ Quickstart
 **********
 
 This document gives simple usage examples of Jbuilder. You can also look at
-`examples <https://github.com/janestreet/jbuilder/tree/master/example>`__ for
+`examples <https://github.com/ocaml/dune/tree/master/example>`__ for
 complete examples of projects using Jbuilder.
 
 Building a hello world program
diff --git a/jbuilder.opam b/jbuilder.opam
index 6d20b8a8..76002d3a 100644
--- a/jbuilder.opam
+++ b/jbuilder.opam
@@ -1,9 +1,9 @@
 opam-version: "1.2"
 maintainer: "opensource@janestreet.com"
 authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
-homepage: "https://github.com/janestreet/jbuilder"
-bug-reports: "https://github.com/janestreet/jbuilder/issues"
-dev-repo: "https://github.com/janestreet/jbuilder.git"
+homepage: "https://github.com/ocaml/dune"
+bug-reports: "https://github.com/ocaml/dune/issues"
+dev-repo: "https://github.com/ocaml/dune.git"
 license: "Apache-2.0"
 build: [
   ["ocaml" "bootstrap.ml"]
diff --git a/src/gen_rules.ml b/src/gen_rules.ml
index 249ed827..29b52f90 100644
--- a/src/gen_rules.ml
+++ b/src/gen_rules.ml
@@ -163,7 +163,7 @@ module Gen(P : Params) = struct
     {|@{<warning>Warning@}: Module %s in %s doesn't have a corresponding .%s file.
 Modules without an implementation are not recommended, see this discussion:
 
-  https://github.com/janestreet/jbuilder/issues/9
+  https://github.com/ocaml/dune/issues/9
 
 In the meantime I'm implicitely adding this rule:
 
@@ -341,7 +341,7 @@ Add it to your jbuild file to remove this warning.
           | Native -> ["-cclib"; "-l" ^ stubs_name]
       in
       let map_cclibs =
-        (* https://github.com/janestreet/jbuilder/issues/119 *)
+        (* https://github.com/ocaml/dune/issues/119 *)
         if ctx.ccomp_type = "msvc" then
           msvc_hack_cclibs
         else
@@ -559,7 +559,7 @@ Add it to your jbuild file to remove this warning.
                ; Path (Path.relative dir (sprintf "%s_stubs" lib.name))
                ; Deps o_files
                ; Dyn (fun cclibs ->
-                   (* https://github.com/janestreet/jbuilder/issues/119 *)
+                   (* https://github.com/ocaml/dune/issues/119 *)
                    if ctx.ccomp_type = "msvc" then
                      let cclibs = msvc_hack_cclibs cclibs in
                      Arg_spec.quote_args "-ldopt" cclibs