diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9789e01f8eca492a80962837fcd0987e39056cc9..ccf726ff3d8aa0bf9f6282651d11915eb1d70e37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 
 - The internal matrix of the`EnergyNorm` can now be accessed by `getMatrix()`.
 
+- The default `BitVectorType` of the class `IterationStep` is now
+  `Solvers::DefaultBitVector_t<VectorType>` rather than `Dune::BitSetVector`.
+  This should do the right thing in more situations, while being fully
+  backward-compatible.
+
 - `codespell` spell checker is now active for automated spell checking in the Gitlab CI. 
   To exclude false positives add the words to the `--ignore-words-list` in `.gitlab-ci.yml`.
 
diff --git a/dune/solvers/iterationsteps/iterationstep.hh b/dune/solvers/iterationsteps/iterationstep.hh
index 7faaff30c415f41a4f4594a9c100dec7af452946..9d63a5c70a9e749d22bf38a3e1a915f8f6ca6cd3 100644
--- a/dune/solvers/iterationsteps/iterationstep.hh
+++ b/dune/solvers/iterationsteps/iterationstep.hh
@@ -6,8 +6,8 @@
 #include <vector>
 #include <string>
 
-#include <dune/common/bitsetvector.hh>
 #include <dune/solvers/common/canignore.hh>
+#include <dune/solvers/common/defaultbitvector.hh>
 #include <dune/solvers/common/numproc.hh>
 
 namespace Dune {
@@ -15,7 +15,7 @@ namespace Dune {
 namespace Solvers {
 
     //! Base class for iteration steps being called by an iterative solver
-template<class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> >
+template<class VectorType, class BitVectorType = Solvers::DefaultBitVector_t<VectorType> >
 class IterationStep : virtual public NumProc, public CanIgnore<BitVectorType>
     {
     public: