diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
index 919b3b2..af8aa08 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
@@ -111,7 +111,10 @@
                     catch (ResolveException ex)
                     {
                         rethrow = ex;
-                        System.out.println("RE: " + ex);
+                        m_logger.log(
+                            Logger.LOG_DEBUG,
+                            "Current candidate permutation failed, will try another if possible.",
+                            ex);
                     }
                 }
                 while ((rethrow != null)
@@ -188,7 +191,10 @@
                     catch (ResolveException ex)
                     {
                         rethrow = ex;
-                        System.out.println("RE: " + ex);
+                        m_logger.log(
+                            Logger.LOG_DEBUG,
+                            "Current candidate permutation failed, will try another if possible.",
+                            ex);
                     }
                 }
                 while ((rethrow != null)
@@ -1356,7 +1362,7 @@
                 Set<Capability> candidates = candidateMap.get(req);
                 if ((candidates != null) && (candidates.size() > 0))
                 {
-                        System.out.println("    " + req + ": " + candidates);
+                    System.out.println("    " + req + ": " + candidates);
                 }
             }
             for (Requirement req : module.getDynamicRequirements())
