diff --git a/dev/build-release.sh b/dev/build-release.sh
index 7aad889e2cba7fa9ecb4f6ffa46581a9aa168ae8..d33eba7fd7dce356d5fca8c6a8182d4a3a7f6ebb 100755
--- a/dev/build-release.sh
+++ b/dev/build-release.sh
@@ -274,7 +274,19 @@ OPAM_FC_DIR="$OPAM_DIR/packages/frama-c/frama-c.$VERSION"
 mkdir -p $OPAM_DIR
 mkdir -p $OPAM_FC_DIR
 
-cat opam | grep -v "^version\:" | grep -v "^name\:" > $OPAM_FC_DIR/opam
+OPAM_VERSION="opam-version: \"2.0\""
+if [ "$FINAL_RELEASE" = "yes" ]; then
+  OPAM_VERSION_FIX="$OPAM_VERSION"
+else
+  OPAM_VERSION_FIX="$OPAM_VERSION\navailable: opam-version >= \"2.1.0\"\nflags: avoid-version"
+fi
+
+cat opam \
+  | grep -v "^version\:" \
+  | grep -v "^name\:" \
+  | sed -e "s/$OPAM_VERSION/$OPAM_VERSION_FIX/" \
+  > $OPAM_FC_DIR/opam
+
 cat >>$OPAM_FC_DIR/opam << EOL
 
 url {