diff --git a/ChangeLog b/ChangeLog
index dcdc134e4..70d04ce4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-21  Badlop  <badlop@process-one.net>
 
+	* src/mod_caps.erl: Move two log calls ERROR_MSG to DEBUG
+	* src/shaper.erl: Move log call INFO_MSG to DEBUG
+
 	* doc/guide.tex: Document s2s_default_policy and
 	s2s_host (EJAB-575)
 	* doc/guide.html: Likewise
diff --git a/src/mod_caps.erl b/src/mod_caps.erl
index a337832f0..8bf37d8be 100644
--- a/src/mod_caps.erl
+++ b/src/mod_caps.erl
@@ -251,9 +251,9 @@ handle_cast({disco_response, From, _To,
 	    end;
 	{error, _} ->
 	    gen_server:cast(self(), visit_feature_queries),
-	    ?ERROR_MSG("Error IQ reponse IQ from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);
+	    ?DEBUG("Error IQ reponse from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);
 	{result, _} ->
-	    ?ERROR_MSG("Invalid IQ contents from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);
+	    ?DEBUG("Invalid IQ contents from ~s:~n~p", [jlib:jid_to_string(From), SubEls]);
 	_ ->
 	    %% Can't do anything about errors
 	    ok
diff --git a/src/shaper.erl b/src/shaper.erl
index 0bede187d..c3f85039f 100644
--- a/src/shaper.erl
+++ b/src/shaper.erl
@@ -58,7 +58,7 @@ update(#maxrate{} = State, Size) ->
     MinInterv = 1000 * Size /
 	(2 * State#maxrate.maxrate - State#maxrate.lastrate),
     Interv = (now_to_usec(now()) - State#maxrate.lasttime) / 1000,
-    ?INFO_MSG("State: ~p, Size=~p~nM=~p, I=~p~n",
+    ?DEBUG("State: ~p, Size=~p~nM=~p, I=~p~n",
               [State, Size, MinInterv, Interv]),
     Pause = if
 		MinInterv > Interv ->