diff -Nru camlidl-1.09/debian/camlidl.install.in camlidl-1.09/debian/camlidl.install.in
--- camlidl-1.09/debian/camlidl.install.in	2020-08-23 09:56:32.000000000 +0000
+++ camlidl-1.09/debian/camlidl.install.in	2020-09-21 17:20:42.000000000 +0000
@@ -1 +1 @@
-debian/META.camlidl @OCamlStdlibDir@/METAS
+debian/META @OCamlStdlibDir@/camlidl
diff -Nru camlidl-1.09/debian/changelog camlidl-1.09/debian/changelog
--- camlidl-1.09/debian/changelog	2020-11-02 12:56:32.000000000 +0000
+++ camlidl-1.09/debian/changelog	2021-04-17 19:55:54.000000000 +0000
@@ -1,8 +1,14 @@
-camlidl (1.09-1build1) hirsute; urgency=medium
+camlidl (1.09-2~ubuntu21.04.1) hirsute; urgency=low
 
-  * No-change rebuild for ocaml abi changes.
+  * No-change backport to hirsute
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 02 Nov 2020 13:56:32 +0100
+ -- Alessandro Strada <alessandro.strada@gmail.com>  Sat, 17 Apr 2021 21:55:54 +0200
+
+camlidl (1.09-2) groovy; urgency=low
+
+  * Compatibility with dune/jbuilder.
+
+ -- Alessandro Strada <alessandro.strada@gmail.com>  Mon, 21 Sep 2020 19:20:42 +0200
 
 camlidl (1.09-1) unstable; urgency=medium
 
diff -Nru camlidl-1.09/debian/control camlidl-1.09/debian/control
--- camlidl-1.09/debian/control	2020-08-23 09:56:32.000000000 +0000
+++ camlidl-1.09/debian/control	2020-09-21 17:20:42.000000000 +0000
@@ -6,7 +6,7 @@
  Ralf Treinen <treinen@debian.org>
 Build-Depends:
  ocaml-nox,
- debhelper-compat (= 13),
+ debhelper-compat (= 9),
  cpp,
  binutils,
  dh-ocaml
diff -Nru camlidl-1.09/debian/META.camlidl.in camlidl-1.09/debian/META.camlidl.in
--- camlidl-1.09/debian/META.camlidl.in	2020-08-23 09:56:32.000000000 +0000
+++ camlidl-1.09/debian/META.camlidl.in	2020-09-21 17:20:42.000000000 +0000
@@ -1,6 +1,5 @@
-# Courtesy of GODI 
-description = "Stub generator"
+description = "Stub generator from IDL description"
 version = "@VERSION@"
-directory = "^"
 archive(byte) = "com.cma"
+archive(byte,plugin) = "com.cma"
 archive(native) = "com.cmxa"
diff -Nru camlidl-1.09/debian/rules camlidl-1.09/debian/rules
--- camlidl-1.09/debian/rules	2020-08-23 09:56:32.000000000 +0000
+++ camlidl-1.09/debian/rules	2020-09-21 17:20:42.000000000 +0000
@@ -33,6 +33,10 @@
 override_dh_auto_install:
 	$(MAKE) install DESTDIR="$(DESTDIR)"
 	sed -i "s/@VERSION@/$(DEB_VERSION_UPSTREAM)/g" debian/META.camlidl
+	mv -v debian/META.camlidl debian/META
+	mkdir $(DESTDIR)/usr/lib/ocaml/$(PACKAGE)
+	mv -v $(DESTDIR)/usr/lib/ocaml/*.* $(DESTDIR)/usr/lib/ocaml/$(PACKAGE)
+	mv -v $(DESTDIR)/usr/lib/ocaml/caml $(DESTDIR)/usr/lib/ocaml/$(PACKAGE)
 
 override_dh_ocaml:
 	dh_ocaml --runtime-map camlidl