diff --git a/ChangeLog b/ChangeLog
index a3df2bc22..67db61b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2007-05-29  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks
+	to Geoff Cant)
+	* src/Makefile.in: Build XmppAddr.beam in a single pass
+	* src/mod_muc/Makefile.in: +debug_info directive support
+	* src/stringprep/Makefile.in: Likewise
+	* src/mod_irc/Makefile.in: Likewise
+	* src/web/Makefile.in: Likewise
+	* src/eldap/Makefile.in: Likewise
+	* src/mod_pubsub/Makefile.in: Likewise
+	* src/ejabberd_zlib/Makefile.in: Likewise
+	* src/mod_proxy65/Makefile.in: Likewise
+	* src/tls/Makefile.in: Likewise
+	* src/odbc/Makefile.in: Likewise
+
 	* src/mod_vcard.erl: Make services description translatable in 
 	discovery (EJAB-236 - thanks to Badlop)
 	* src/mod_muc/mod_muc.erl: Likewise
diff --git a/src/Makefile.in b/src/Makefile.in
index 102999cca..4998c2cd9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -12,6 +12,7 @@ ERLANG_CFLAGS= @ERLANG_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
+ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
   ERLC_FLAGS+=+debug_info
@@ -42,8 +43,6 @@ MSGSDIR = $(PRIVDIR)/msgs
 LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
 ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
 
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
-
 ifeq ($(shell uname),Darwin)
 DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
 else
@@ -71,6 +70,7 @@ mostlyclean-recursive maintainer-clean-recursive:
 
 %.hrl: %.asn1
 	@ERLC@ $(ASN_FLAGS) $<
+	@ERLC@ -W $(ERLC_FLAGS) $*.erl
 
 $(ERLSHLIBS):	%.so:	%.c
 			gcc -Wall $(CFLAGS) $(LDFLAGS) $(LIBS) \
@@ -109,3 +109,7 @@ TAGS:
 	etags *.erl
 
 Makefile: Makefile.in
+
+dialyzer: $(BEAMS)
+	@dialyzer -c .
+
diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in
index 2a44860c5..7b123395e 100644
--- a/src/ejabberd_zlib/Makefile.in
+++ b/src/ejabberd_zlib/Makefile.in
@@ -19,6 +19,11 @@ ERLSHLIBS = ../ejabberd_zlib_drv.so
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/ejabberd_zlib.beam
 
diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index f244fe1b5..76d731444 100644
--- a/src/eldap/Makefile.in
+++ b/src/eldap/Makefile.in
@@ -10,6 +10,11 @@ SUBDIRS =
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/eldap.beam \
 	$(OUTDIR)/ELDAPv3.beam \
diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in
index a206027d5..e30933b09 100644
--- a/src/mod_irc/Makefile.in
+++ b/src/mod_irc/Makefile.in
@@ -19,6 +19,11 @@ ERLSHLIBS = ../iconv_erl.so
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/mod_irc.beam \
 	$(OUTDIR)/mod_irc_connection.beam \
diff --git a/src/mod_muc/Makefile.in b/src/mod_muc/Makefile.in
index 6ab1d8a72..6b303d702 100644
--- a/src/mod_muc/Makefile.in
+++ b/src/mod_muc/Makefile.in
@@ -10,6 +10,11 @@ SUBDIRS =
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/mod_muc.beam \
 	$(OUTDIR)/mod_muc_log.beam \
diff --git a/src/mod_proxy65/Makefile.in b/src/mod_proxy65/Makefile.in
index 671b12584..bb70ac5cb 100644
--- a/src/mod_proxy65/Makefile.in
+++ b/src/mod_proxy65/Makefile.in
@@ -10,6 +10,11 @@ SUBDIRS =
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/mod_proxy65.beam \
 	$(OUTDIR)/mod_proxy65_service.beam \
diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in
index e007294e0..0b296ee41 100644
--- a/src/mod_pubsub/Makefile.in
+++ b/src/mod_pubsub/Makefile.in
@@ -10,6 +10,11 @@ SUBDIRS =
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/mod_pubsub.beam
 
diff --git a/src/odbc/Makefile.in b/src/odbc/Makefile.in
index af2a2463f..777713633 100644
--- a/src/odbc/Makefile.in
+++ b/src/odbc/Makefile.in
@@ -8,9 +8,13 @@ LIBS = @LIBS@ @ERLANG_LIBS@
 
 SUBDIRS = 
 
-
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/ejabberd_odbc.beam \
 	$(OUTDIR)/ejabberd_odbc_sup.beam \
diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in
index 2d858cc2e..e44f8c96a 100644
--- a/src/stringprep/Makefile.in
+++ b/src/stringprep/Makefile.in
@@ -19,6 +19,11 @@ ERLSHLIBS = ../stringprep_drv.so
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/stringprep.beam
 
diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in
index 4b32fd84d..60505a56c 100644
--- a/src/tls/Makefile.in
+++ b/src/tls/Makefile.in
@@ -19,6 +19,11 @@ ERLSHLIBS = ../tls_drv.so
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/tls.beam
 
diff --git a/src/web/Makefile.in b/src/web/Makefile.in
index 2656504e8..bc5c2da0f 100644
--- a/src/web/Makefile.in
+++ b/src/web/Makefile.in
@@ -11,6 +11,11 @@ SUBDIRS =
 
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
+# make debug=true to compile Erlang module with debug informations.
+ifdef debug
+  EFLAGS+=+debug_info
+endif
+
 OBJS   = \
 	$(OUTDIR)/ejabberd_http.beam \
 	$(OUTDIR)/ejabberd_web.beam  \