diff --git a/ChangeLog b/ChangeLog
index 947a8e4ad..9e9fc965a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-30  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
+
+	* src/Makefile.in: Remove the -I flag for exmpp includes; the
+	-include_lib pragma is a better solution.
+
+	* src/ejabberd_c2s.erl, src/ejabberd_s2s_in.erl,
+	src/ejabberd_s2s_out.erl: Use -include_lib instead of -include to
+	include exmpp.hrl.
+
 2008-06-27  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
 	* src/ejabberd_c2s.erl, src/ejabberd_s2s_out.erl,
diff --git a/src/Makefile.in b/src/Makefile.in
index 7391a8d9a..57bb56333 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -12,7 +12,7 @@ ERLANG_CFLAGS= @ERLANG_CFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-ERLC_FLAGS += @ERLANG_SSL39@ -I@ERLANG_EXMPP@/include
+ERLC_FLAGS += @ERLANG_SSL39@
 
 ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
 # make debug=true to compile Erlang module with debug informations.
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 953e9beb2..828df898c 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -54,7 +54,7 @@
 	 handle_info/3,
 	 terminate/3]).
 
--include("exmpp.hrl").
+-include_lib("exmpp/include/exmpp.hrl").
 
 -include("ejabberd.hrl").
 -include("mod_privacy.hrl").
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index ed8b922e0..70f5cecce 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -46,7 +46,7 @@
 	 handle_info/3,
 	 terminate/3]).
 
- -include("exmpp.hrl").
+-include_lib("exmpp/include/exmpp.hrl").
 
 -include("ejabberd.hrl").
 -ifdef(SSL39).
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index ef099609b..19f68d25e 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -54,7 +54,7 @@
 	 code_change/4,
 	 test_get_addr_port/1]).
 
--include("exmpp.hrl").
+-include_lib("exmpp/include/exmpp.hrl").
 
 -include("ejabberd.hrl").