diff --git a/packages/goblint-cil/goblint-cil.2.0.0/opam b/packages/goblint-cil/goblint-cil.2.0.0/opam
new file mode 100644
index 000000000000..203cefab962d
--- /dev/null
+++ b/packages/goblint-cil/goblint-cil.2.0.0/opam
@@ -0,0 +1,74 @@
+opam-version: "2.0"
+synopsis:
+  "A front-end for the C programming language that facilitates program analysis and transformation"
+description: """
+This is a fork of the 'cil' package used for 'goblint'. Major changes include:
+* Support for C99 and C11.
+* Compatibility with modern OCaml versions.
+* Use Zarith instead of Num and use that for integer constants.
+* Improved locations with columns and spans.
+* Removal of unmaintained extensions and MSVC support.
+* Use dune instead of make and ocamlbuild.
+* Many bug fixes."""
+maintainer: [
+  "Michael Schwarz <michael.schwarz93@gmail.com>"
+  "Simmo Saan <simmo.saan@gmail.com>"
+]
+authors: [
+  "George Necula"
+  "Scott McPeak"
+  "Westley Weimer"
+  "Gabriel Kerneis"
+  "Ralf Vogler"
+  "Michael Schwarz"
+  "Simmo Saan"
+]
+license: "BSD-3-Clause"
+homepage: "https://github.com/goblint/cil"
+bug-reports: "https://github.com/goblint/cil/issues"
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "ocamlfind" {with-test}
+  "zarith"
+  "hevea" {with-doc}
+  "dune" {>= "2.7"}
+  "dune-configurator"
+  "odoc" {with-doc}
+  "stdlib-shims"
+  "ppx_deriving_yojson" {>= "3.2"}
+  "yojson"
+  "conf-perl"
+  "cppo"
+  "conf-gcc"
+]
+conflicts: ["cil"]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/goblint/cil.git"
+depexts: [
+  ["perl-ExtUtils-MakeMaker"] {os-distribution = "centos" | os-distribution = "fedora" | os-distribution = "ol"}
+  ["perl-FindBin"] {os-distribution = "fedora"}
+  ["build-base"] {os-distribution = "alpine"}
+]
+available: arch != "x86_32" & arch != "arm32" & arch != "ppc32" & arch != "ppc64" & arch != "s390x"
+url {
+  src:
+    "https://github.com/goblint/cil/releases/download/2.0.0/goblint-cil-2.0.0.tbz"
+  checksum: [
+    "sha256=0467f30218c7ef03074b96912e46f58883e5229ba7d30102470191ad39a49b26"
+    "sha512=08a7a1a79dce32072431dd681866682e9dab7acbc4cb6e0e2255d6b71fea7020d7fcf00bbbb130489b77f03fa244382dce30eca67d75967e81b06e09996d44a8"
+  ]
+}
+x-commit-hash: "9968b57aae763fd0b5d652e13e2f18b643eb82e4"
diff --git a/packages/goblint/goblint.1.0.0/opam b/packages/goblint/goblint.1.0.0/opam
index 5348ba684bd8..fde0c6d2eca2 100644
--- a/packages/goblint/goblint.1.0.0/opam
+++ b/packages/goblint/goblint.1.0.0/opam
@@ -1,5 +1,12 @@
 opam-version: "2.0"
 maintainer: "Ralf Vogler <ralf.vogler@gmail.com>"
+authors: [
+  "Vesal Vojdani"
+  "Kalmer Apinis"
+  "Martin D. Schwarz"
+  "Alexander Herz"
+  "Ralf Vogler"
+]
 license: "MIT"
 homepage: "https://github.com/goblint/analyzer"
 bug-reports: "https://github.com/goblint/analyzer/issues"
@@ -9,7 +16,7 @@ depends: [
   "ocaml" {>= "4.04.1" & < "4.07"}
   "ocamlbuild" {build}
   "ocamlfind" {build}
-  "goblint-cil" {build}
+  "goblint-cil" {build & < "1.8.0"}
   "batteries" {build & < "3.4.0"}
   "xml-light" {build}
   "ppx_distr_guards"
@@ -17,6 +24,8 @@ depends: [
   "ppx_import"
   "ppx_deriving"
   "ppx_deriving_yojson"
+  "yojson" {< "1.6.0"}
+  "conf-gcc"
 ]
 synopsis: "Static analysis framework for concurrent C"
 url {
diff --git a/packages/goblint/goblint.1.1.1/opam b/packages/goblint/goblint.1.1.1/opam
index 1c08585a0de6..ea09996def67 100644
--- a/packages/goblint/goblint.1.1.1/opam
+++ b/packages/goblint/goblint.1.1.1/opam
@@ -20,7 +20,7 @@ bug-reports: "https://github.com/goblint/analyzer/issues"
 depends: [
   "ocaml" {>= "4.09"}
   "dune" {>= "2.9.1"}
-  "goblint-cil" {>= "1.8.2"}
+  "goblint-cil" {>= "1.8.2" & < "2.0.0"}
   "batteries" {>= "3.2.0" & < "3.4.0"}
   "zarith" {>= "1.8"}
   "qcheck-core"
@@ -35,6 +35,7 @@ depends: [
   "conf-gmp" {>= "3"}
   "conf-ruby" {with-test}
   "benchmark" {with-test}
+  "conf-gcc"
 ]
 depopts: ["apron" "z3"]
 build: [