diff --git a/src/Makefile.in b/src/Makefile.in
index 496d101bc..dd728ce02 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -37,8 +37,10 @@ ifdef debug
   EFLAGS+=+debug_info +export_all
 endif
 
+DEBUGTOOLS = ejabberd_debug.erl
 ifdef ejabberd_debug
   EFLAGS+=-Dejabberd_debug
+  SOURCES+=$(DEBUGTOOLS)
 endif
 
 ifeq (@hipe@, true)
@@ -69,7 +71,8 @@ SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ str
 ERLSHLIBS = expat_erl.so
 ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl
 SOURCES_ALL = $(wildcard *.erl)
-SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
+SOURCES_MISC = $(ERLBEHAVS) $(DEBUGTOOLS)
+SOURCES += $(filter-out $(SOURCES_MISC),$(SOURCES_ALL))
 ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
 BEAMS = $(SOURCES:.erl=.beam)
 
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
index 7d40c64c4..7a54fcc37 100644
--- a/src/ejabberd_app.erl
+++ b/src/ejabberd_app.erl
@@ -85,7 +85,7 @@ prep_stop(State) ->
 stop(_State) ->
     ?INFO_MSG("ejabberd ~s is stopped in the node ~p", [?VERSION, node()]),
     delete_pid_file(),
-    ejabberd_debug:stop(),
+    %%ejabberd_debug:stop(),
     ok.