diff --git a/srcpkgs/opam/patches/fix_url.patch b/srcpkgs/opam/patches/fix_url.patch
deleted file mode 100644
index d4f348837d8..00000000000
--- a/srcpkgs/opam/patches/fix_url.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src_ext/Makefile.orig	2015-04-27 09:46:51.000000000 +0200
-+++ src_ext/Makefile	2016-09-15 05:38:45.453896142 +0200
-@@ -2,7 +2,7 @@
- 
- SRC_EXTS = extlib re cmdliner graph cudf dose uutf jsonm
- 
--URL_extlib = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz
-+URL_extlib = http://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ocaml-extlib/extlib-1.5.3.tar.gz
- MD5_extlib = 3de5f4e0a95fda7b2f3819c4a655b17c
- 
- URL_re = https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 2fc78ee8ce4..600dab4d074 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,12 +1,12 @@
 # Template file for 'opam'
 pkgname=opam
-version=1.2.2
-revision=6
+version=2.0.0
+revision=1
 build_style=gnu-configure
 disable_parallel_build=yes
 make_build_args="lib-ext all"
 make_check_target="tests"
-makedepends="ncurses-devel ocaml curl"
+makedepends="curl ncurses-devel ocaml ocaml-findlib"
 depends="curl patch unzip"
 checkdepends="${depends} git rsync"
 short_desc="OCaml package manager"
@@ -14,6 +14,5 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=3e4a05df6ff8deecba019d885ebe902eb933acb6e2fc7784ffee1ee14871e36a
+checksum=1e9b47a66a952571b32217c58d0c58d2d66706083969dcfa1e42a60ecce30121
 nocross=yes
-export OCAMLPARAM="safe-string=0,_"