diff --git a/packages/batteries/batteries.1.4.3/opam b/packages/batteries/batteries.1.4.3/opam
index fbd51137fcf..8099b874e98 100644
--- a/packages/batteries/batteries.1.4.3/opam
+++ b/packages/batteries/batteries.1.4.3/opam
@@ -20,6 +20,6 @@ synopsis: "Community-maintained foundation library"
 flags: light-uninstall
 url {
   src:
-    "http://forge.ocamlcore.org/frs/download.php/884/batteries-1.4.3.tar.gz"
+    "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v1.4.3/batteries-1.4.3.tar.gz"
   checksum: "md5=af93a95bcbfeaa188453b7495b815413"
 }
diff --git a/packages/batteries/batteries.1.5.0/opam b/packages/batteries/batteries.1.5.0/opam
index 93157ecdeab..7654c83441d 100644
--- a/packages/batteries/batteries.1.5.0/opam
+++ b/packages/batteries/batteries.1.5.0/opam
@@ -20,6 +20,6 @@ synopsis: "Community-maintained foundation library"
 flags: light-uninstall
 url {
   src:
-    "http://forge.ocamlcore.org/frs/download.php/950/batteries-1.5.0.tar.gz"
+    "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v1.5.0/batteries-1.5.0.tar.gz"
   checksum: "md5=40b7022fddba246062fd489eeb15cd84"
 }
diff --git a/packages/batteries/batteries.2.0.0/opam b/packages/batteries/batteries.2.0.0/opam
index 72778152441..f78b65c83ec 100644
--- a/packages/batteries/batteries.2.0.0/opam
+++ b/packages/batteries/batteries.2.0.0/opam
@@ -18,6 +18,6 @@ synopsis: "Community-maintained foundation library"
 flags: light-uninstall
 url {
   src:
-    "https://forge.ocamlcore.org/frs/download.php/1096/batteries-2.0.tar.gz"
+    "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v2.0.0/batteries-2.0.tar.gz"
   checksum: "md5=ab93a8a6ed7d94ca7c7be26862b4e1e9"
 }
diff --git a/packages/batteries/batteries.2.1.0/opam b/packages/batteries/batteries.2.1.0/opam
index b4880e16c03..414ae0bfda4 100644
--- a/packages/batteries/batteries.2.1.0/opam
+++ b/packages/batteries/batteries.2.1.0/opam
@@ -20,6 +20,6 @@ flags: light-uninstall
 extra-files: ["cloexec.patch" "md5=1e028dc99ffbdad4be64df4bc6ceecff"]
 url {
   src:
-    "https://forge.ocamlcore.org/frs/download.php/1218/batteries-2.1.tar.gz"
+    "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v2.1.0/batteries-2.1.tar.gz"
   checksum: "md5=95567687a675107e58c66b93b9ea9bb1"
 }
diff --git a/packages/batteries/batteries.2.2.0/opam b/packages/batteries/batteries.2.2.0/opam
index 17d93f3ad79..f9081a0dc53 100644
--- a/packages/batteries/batteries.2.2.0/opam
+++ b/packages/batteries/batteries.2.2.0/opam
@@ -20,6 +20,6 @@ description:
 flags: light-uninstall
 url {
   src:
-    "https://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz"
+    "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v2.2.0/batteries-2.2.tar.gz"
   checksum: "md5=42063b5f2da9a311ff16799b8bec4ba5"
 }
diff --git a/packages/batteries/batteries.2.9.0/opam b/packages/batteries/batteries.2.9.0/opam
new file mode 100644
index 00000000000..321e11963e3
--- /dev/null
+++ b/packages/batteries/batteries.2.9.0/opam
@@ -0,0 +1,32 @@
+opam-version: "2.0"
+description: "A community-maintained standard library extension"
+maintainer: [
+  "Francois Berenger"
+  "Gabriel Scherer <gabriel.scherer@gmail.com>"
+  "Thibault Suzanne <thi.suzanne@gmail.com>"
+]
+authors: "OCaml batteries-included team"
+homepage: "http://batteries.forge.ocamlcore.org/"
+bug-reports: "https://github.com/ocaml-batteries-team/batteries-included/issues"
+dev-repo: "git://github.com/ocaml-batteries-team/batteries-included.git"
+license: "LGPL-2.1+ with OCaml linking exception"
+doc: "http://ocaml-batteries-team.github.io/batteries-included/hdoc2/"
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
+  [make "all"]
+]
+install: [make "install"]
+remove: ["ocamlfind" "remove" "batteries"]
+depends: [
+  "ocaml" {>= "4.00.0" & < "4.08.0"}
+  "ocamlfind" {build & >= "1.5.3"}
+  "ocamlbuild" {build}
+  "qtest" {test & >= "2.5"}
+  "qcheck" {test & >= "0.6"}
+  "num"
+]
+url {
+  src:
+    "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v2.9.0/batteries-2.9.0.tar.gz"
+  checksum: "md5=482adf4d08e90cc215dbaee0314a84fa"
+}
diff --git a/packages/yajl-extra/yajl-extra.0.7.0/opam b/packages/yajl-extra/yajl-extra.0.7.0/opam
index 391949ec2f6..ba7d4dbccd3 100644
--- a/packages/yajl-extra/yajl-extra.0.7.0/opam
+++ b/packages/yajl-extra/yajl-extra.0.7.0/opam
@@ -4,7 +4,7 @@ remove: [["ocamlfind" "remove" "JSON"]]
 depends: [
   "ocaml"
   "ocamlfind"
-  "batteries"
+  "batteries" {< "2.0.0"}
   "yajl"
   "ocamlbuild" {build}
 ]
diff --git a/packages/yajl-extra/yajl-extra.0.7.1/opam b/packages/yajl-extra/yajl-extra.0.7.1/opam
index db0fb9b9708..df0dff6f0b9 100644
--- a/packages/yajl-extra/yajl-extra.0.7.1/opam
+++ b/packages/yajl-extra/yajl-extra.0.7.1/opam
@@ -4,7 +4,7 @@ remove: [["ocamlfind" "remove" "yajl-extra"]]
 depends: [
   "ocaml"
   "ocamlfind"
-  "batteries"
+  "batteries" {< "2.0.0"}
   "yajl"
   "ocamlbuild" {build}
 ]
diff --git a/packages/yajl-extra/yajl-extra.0.7.2/opam b/packages/yajl-extra/yajl-extra.0.7.2/opam
index baaca6b0890..3a659d1619b 100644
--- a/packages/yajl-extra/yajl-extra.0.7.2/opam
+++ b/packages/yajl-extra/yajl-extra.0.7.2/opam
@@ -4,7 +4,7 @@ remove: [["ocamlfind" "remove" "yajl-extra"]]
 depends: [
   "ocaml"
   "ocamlfind"
-  "batteries"
+  "batteries" {< "2.0.0"}
   "yajl"
   "ocamlbuild" {build}
 ]