diff --git a/dune/solvers/solvers/criterion.hh b/dune/solvers/solvers/criterion.hh
index cd5ed60d1919c4700d6770a8e7664ea7cca3cc78..54473242708eec8d87c1b5fc53ab45a05bb90587 100644
--- a/dune/solvers/solvers/criterion.hh
+++ b/dune/solvers/solvers/criterion.hh
@@ -10,6 +10,11 @@
 
 #include <dune/common/stringutility.hh>
 
+
+/**
+ * \attention Everything contained in this headere is experimental and may change in the near future.
+ */
+
 namespace Dune {
 
   namespace Solvers {
diff --git a/dune/solvers/solvers/loopsolver.hh b/dune/solvers/solvers/loopsolver.hh
index 53220ca913802d369af0c21128e5b8b8027e5224..57e28cd8dfdf6bbe6dd2f4dc5ad3d95cd6f51708 100644
--- a/dune/solvers/solvers/loopsolver.hh
+++ b/dune/solvers/solvers/loopsolver.hh
@@ -63,6 +63,12 @@ public:
      * This method forward all arguments to the constructor of
      * Criterion. So you can pass a Criterion or any argument
      * list supported by the Criterion constructors.
+     *
+     * Notice, that the old hard-wired criteria are still active.
+     * If you don't supply any criteria here, the you will get
+     * exactly the old behaviour.
+     *
+     * \attention This is an experimental feature that may still change in the near future.
      */
     template<class... Args>
     void addCriterion(Args&&... args)