diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
index 34e5a70..cf25fd0 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
@@ -92,10 +92,11 @@
             manager = new BldRepositoryManager( repos );
         }
 
-        IResolutionMonitor nullMonitor = new IResolutionMonitor()
+        IResolutionMonitor ivyMonitor = new IResolutionMonitor()
         {
             public void endResolution( IModelElement requirement, ISigilBundle sigilBundle )
             {
+                Log.debug( "Resolved " + requirement + " -> " + sigilBundle );
             }
 
 
@@ -107,9 +108,10 @@
 
             public void startResolution( IModelElement requirement )
             {
+                Log.verbose( "Resolving " + requirement );
             }
         };
 
-        return manager.getBundleResolver().resolve( element, config, nullMonitor );
+        return manager.getBundleResolver().resolve( element, config, ivyMonitor );
     }
 }
