diff --git a/packages/ocamlfind/ocamlfind.1.3.1/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.3.1/files/ocamlfind.install.in
similarity index 66%
rename from packages/ocamlfind/ocamlfind.1.3.1/files/ocamlfind.install
rename to packages/ocamlfind/ocamlfind.1.3.1/files/ocamlfind.install.in
index c4e91b611515..77fc443e6da6 100644
--- a/packages/ocamlfind/ocamlfind.1.3.1/files/ocamlfind.install
+++ b/packages/ocamlfind/ocamlfind.1.3.1/files/ocamlfind.install.in
@@ -1,5 +1,5 @@
 bin: [
-  "src/findlib/ocamlfind"
+  "src/findlib/ocamlfind%{exe}%"
   "tools/safe_camlp4"
 ]
 toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.3.1/opam b/packages/ocamlfind/ocamlfind.1.3.1/opam
index 5e1185043bb2..aa40dc7a5e7b 100644
--- a/packages/ocamlfind/ocamlfind.1.3.1/opam
+++ b/packages/ocamlfind/ocamlfind.1.3.1/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.3.2/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.3.2/files/ocamlfind.install.in
similarity index 66%
rename from packages/ocamlfind/ocamlfind.1.3.2/files/ocamlfind.install
rename to packages/ocamlfind/ocamlfind.1.3.2/files/ocamlfind.install.in
index c4e91b611515..77fc443e6da6 100644
--- a/packages/ocamlfind/ocamlfind.1.3.2/files/ocamlfind.install
+++ b/packages/ocamlfind/ocamlfind.1.3.2/files/ocamlfind.install.in
@@ -1,5 +1,5 @@
 bin: [
-  "src/findlib/ocamlfind"
+  "src/findlib/ocamlfind%{exe}%"
   "tools/safe_camlp4"
 ]
 toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.3.2/opam b/packages/ocamlfind/ocamlfind.1.3.2/opam
index 18662ae64d66..c2dcda387d13 100644
--- a/packages/ocamlfind/ocamlfind.1.3.2/opam
+++ b/packages/ocamlfind/ocamlfind.1.3.2/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.3.3/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.3.3/files/ocamlfind.install.in
similarity index 66%
rename from packages/ocamlfind/ocamlfind.1.3.3/files/ocamlfind.install
rename to packages/ocamlfind/ocamlfind.1.3.3/files/ocamlfind.install.in
index c4e91b611515..77fc443e6da6 100644
--- a/packages/ocamlfind/ocamlfind.1.3.3/files/ocamlfind.install
+++ b/packages/ocamlfind/ocamlfind.1.3.3/files/ocamlfind.install.in
@@ -1,5 +1,5 @@
 bin: [
-  "src/findlib/ocamlfind"
+  "src/findlib/ocamlfind%{exe}%"
   "tools/safe_camlp4"
 ]
 toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.3.3/opam b/packages/ocamlfind/ocamlfind.1.3.3/opam
index e614f950e453..c129addd575d 100644
--- a/packages/ocamlfind/ocamlfind.1.3.3/opam
+++ b/packages/ocamlfind/ocamlfind.1.3.3/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.4.0/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.4.0/files/ocamlfind.install.in
similarity index 66%
rename from packages/ocamlfind/ocamlfind.1.4.0/files/ocamlfind.install
rename to packages/ocamlfind/ocamlfind.1.4.0/files/ocamlfind.install.in
index c4e91b611515..77fc443e6da6 100644
--- a/packages/ocamlfind/ocamlfind.1.4.0/files/ocamlfind.install
+++ b/packages/ocamlfind/ocamlfind.1.4.0/files/ocamlfind.install.in
@@ -1,5 +1,5 @@
 bin: [
-  "src/findlib/ocamlfind"
+  "src/findlib/ocamlfind%{exe}%"
   "tools/safe_camlp4"
 ]
 toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.4.0/opam b/packages/ocamlfind/ocamlfind.1.4.0/opam
index 9c53aca3884b..4b6ce0fe0a39 100644
--- a/packages/ocamlfind/ocamlfind.1.4.0/opam
+++ b/packages/ocamlfind/ocamlfind.1.4.0/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.4.1/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.4.1/files/ocamlfind.install
deleted file mode 100644
index 4dc43e8926f1..000000000000
--- a/packages/ocamlfind/ocamlfind.1.4.1/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.4.1/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.4.1/files/ocamlfind.install.in
new file mode 100644
index 000000000000..37c9b49364b7
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.4.1/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.4.1/opam b/packages/ocamlfind/ocamlfind.1.4.1/opam
index 9c53aca3884b..4b6ce0fe0a39 100644
--- a/packages/ocamlfind/ocamlfind.1.4.1/opam
+++ b/packages/ocamlfind/ocamlfind.1.4.1/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.1/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.5.1/files/ocamlfind.install
deleted file mode 100644
index 295c62545fdf..000000000000
--- a/packages/ocamlfind/ocamlfind.1.5.1/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "?tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.1/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.5.1/files/ocamlfind.install.in
new file mode 100644
index 000000000000..ba3b2cecf906
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.5.1/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "?tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.1/opam b/packages/ocamlfind/ocamlfind.1.5.1/opam
index 597e44e47781..243486a21772 100644
--- a/packages/ocamlfind/ocamlfind.1.5.1/opam
+++ b/packages/ocamlfind/ocamlfind.1.5.1/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.2/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.5.2/files/ocamlfind.install
deleted file mode 100644
index 295c62545fdf..000000000000
--- a/packages/ocamlfind/ocamlfind.1.5.2/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "?tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.2/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.5.2/files/ocamlfind.install.in
new file mode 100644
index 000000000000..ba3b2cecf906
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.5.2/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "?tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.2/opam b/packages/ocamlfind/ocamlfind.1.5.2/opam
index 597e44e47781..243486a21772 100644
--- a/packages/ocamlfind/ocamlfind.1.5.2/opam
+++ b/packages/ocamlfind/ocamlfind.1.5.2/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.3/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.5.3/files/ocamlfind.install
deleted file mode 100644
index 295c62545fdf..000000000000
--- a/packages/ocamlfind/ocamlfind.1.5.3/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "?tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.3/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.5.3/files/ocamlfind.install.in
new file mode 100644
index 000000000000..ba3b2cecf906
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.5.3/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "?tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.3/opam b/packages/ocamlfind/ocamlfind.1.5.3/opam
index 597e44e47781..243486a21772 100644
--- a/packages/ocamlfind/ocamlfind.1.5.3/opam
+++ b/packages/ocamlfind/ocamlfind.1.5.3/opam
@@ -1,5 +1,6 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.4/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.5.4/files/ocamlfind.install
deleted file mode 100644
index 295c62545fdf..000000000000
--- a/packages/ocamlfind/ocamlfind.1.5.4/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "?tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.4/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.5.4/files/ocamlfind.install.in
new file mode 100644
index 000000000000..ba3b2cecf906
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.5.4/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "?tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.4/opam b/packages/ocamlfind/ocamlfind.1.5.4/opam
index 7ec96cdee9e2..7752980d289e 100644
--- a/packages/ocamlfind/ocamlfind.1.5.4/opam
+++ b/packages/ocamlfind/ocamlfind.1.5.4/opam
@@ -1,6 +1,7 @@
 opam-version: "1"
 maintainer: "contact@ocamlpro.com"
 patches: [ "1.5.4-sed-bsd-compat.patch" ]
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.5/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.5.5/files/ocamlfind.install
deleted file mode 100644
index 295c62545fdf..000000000000
--- a/packages/ocamlfind/ocamlfind.1.5.5/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "?tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.5/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.5.5/files/ocamlfind.install.in
new file mode 100644
index 000000000000..ba3b2cecf906
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.5.5/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "?tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.5/opam b/packages/ocamlfind/ocamlfind.1.5.5/opam
index 7c5c214163d2..5dbc84da0d4b 100644
--- a/packages/ocamlfind/ocamlfind.1.5.5/opam
+++ b/packages/ocamlfind/ocamlfind.1.5.5/opam
@@ -5,6 +5,7 @@ homepage:     "http://projects.camlcity.org/projects/findlib.html"
 bug-reports:  "mailto:gerd@gerd-stolpmann.de"
 dev-repo:     "https://github.com/whitequark/ocaml-findlib.git"
 
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.6/files/ocamlfind.install b/packages/ocamlfind/ocamlfind.1.5.6/files/ocamlfind.install
deleted file mode 100644
index 295c62545fdf..000000000000
--- a/packages/ocamlfind/ocamlfind.1.5.6/files/ocamlfind.install
+++ /dev/null
@@ -1,6 +0,0 @@
-bin: [
-  "src/findlib/ocamlfind" {"ocamlfind"}
-  "?src/findlib/ocamlfind_opt" {"ocamlfind"}
-  "?tools/safe_camlp4"
-]
-toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.6/files/ocamlfind.install.in b/packages/ocamlfind/ocamlfind.1.5.6/files/ocamlfind.install.in
new file mode 100644
index 000000000000..ba3b2cecf906
--- /dev/null
+++ b/packages/ocamlfind/ocamlfind.1.5.6/files/ocamlfind.install.in
@@ -0,0 +1,6 @@
+bin: [
+  "src/findlib/ocamlfind%{exe}%" {"ocamlfind"}
+  "?src/findlib/ocamlfind_opt%{exe}%" {"ocamlfind"}
+  "?tools/safe_camlp4"
+]
+toplevel: ["src/findlib/topfind"]
diff --git a/packages/ocamlfind/ocamlfind.1.5.6/opam b/packages/ocamlfind/ocamlfind.1.5.6/opam
index 7c5c214163d2..5dbc84da0d4b 100644
--- a/packages/ocamlfind/ocamlfind.1.5.6/opam
+++ b/packages/ocamlfind/ocamlfind.1.5.6/opam
@@ -5,6 +5,7 @@ homepage:     "http://projects.camlcity.org/projects/findlib.html"
 bug-reports:  "mailto:gerd@gerd-stolpmann.de"
 dev-repo:     "https://github.com/whitequark/ocaml-findlib.git"
 
+substs: ["ocamlfind.install"]
 build: [
   ["./configure" "-bindir" bin "-sitelib" lib "-mandir" man "-config" "%{lib}%/findlib.conf" "-no-topfind" {preinstalled}]
   [make "all"]