diff --git a/configure b/configure
index 3ef9f63487b..719c8e44936 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for opam 2.1.5.
+# Generated by GNU Autoconf 2.71 for opam 2.1.6.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -609,8 +609,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.1.5'
-PACKAGE_STRING='opam 2.1.5'
+PACKAGE_VERSION='2.1.6'
+PACKAGE_STRING='opam 2.1.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.1.5 to adapt to many kinds of systems.
+\`configure' configures opam 2.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1392,7 +1392,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.1.5:";;
+     short | recursive ) echo "Configuration of opam 2.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1502,7 +1502,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.1.5
+opam configure 2.1.6
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1699,7 +1699,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.1.5, which was
+It was created by opam $as_me 2.1.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -7479,7 +7479,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.1.5, which was
+This file was extended by opam $as_me 2.1.6, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7534,7 +7534,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-opam config.status 2.1.5
+opam config.status 2.1.6
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3df29fec7e9..77cfdbec317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
-AC_INIT(opam,2.1.5)
+AC_INIT(opam,2.1.6)
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/opam-client.opam b/opam-client.opam
index b6ab961a780..2124a0eec15 100644
--- a/opam-client.opam
+++ b/opam-client.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Client library for opam 2.1"
 description: """
 Actions on the opam root, switches, installations, and front-end.
diff --git a/opam-core.opam b/opam-core.opam
index 81f35075904..68eaf35aad8 100644
--- a/opam-core.opam
+++ b/opam-core.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Core library for opam 2.1"
 description: """
 Small standard library extensions, and generic system interaction modules used by opam.
diff --git a/opam-devel.opam b/opam-devel.opam
index 347bdbd40b7..cfd0d7cff42 100644
--- a/opam-devel.opam
+++ b/opam-devel.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Bootstrapped development binary for opam 2.1"
 description: """
 This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.
diff --git a/opam-format.opam b/opam-format.opam
index b956105eb25..58c588dd89f 100644
--- a/opam-format.opam
+++ b/opam-format.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Format library for opam 2.1"
 description: """
 Definition of opam datastructures and its file interface.
diff --git a/opam-installer.opam b/opam-installer.opam
index 1f40ebbe0fe..bc020285ffe 100644
--- a/opam-installer.opam
+++ b/opam-installer.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.
diff --git a/opam-repository.opam b/opam-repository.opam
index 4a8b14cfcf8..1932decde06 100644
--- a/opam-repository.opam
+++ b/opam-repository.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Repository library for opam 2.1"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
diff --git a/opam-solver.opam b/opam-solver.opam
index 5aeea4a16a7..366c3546ed5 100644
--- a/opam-solver.opam
+++ b/opam-solver.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Solver library for opam 2.1"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.
diff --git a/opam-state.opam b/opam-state.opam
index 6c4c67402b0..58a13ce9910 100644
--- a/opam-state.opam
+++ b/opam-state.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "State library for opam 2.1"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.
diff --git a/opam.opam b/opam.opam
index 1d0daa644c4..c7ef5d3ae62 100644
--- a/opam.opam
+++ b/opam.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.5"
+version: "2.1.6"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [