diff --git a/ChangeLog b/ChangeLog
index 51ac49d13..d74c079bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-05  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_config.erl: Refactoring: Move internal
+	data structure to an include file.
+	* src/ejabberd_config.hrl: Likewise.
+
 2007-11-03  Mickael Remond  <mremond@process-one.net>
 
 	* src/ejabberd_auth.erl: Better count management and batch users
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index a06d4e2bc..be2287a8d 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -13,14 +13,7 @@
 	 get_global_option/1, get_local_option/1]).
 
 -include("ejabberd.hrl").
-
--record(config, {key, value}).
--record(local_config, {key, value}).
--record(state, {opts = [],
-		hosts = [],
-		override_local = false,
-		override_global = false,
-		override_acls = false}).
+-include("ejabberd_config.hrl").
 
 start() ->
     mnesia:create_table(config,
diff --git a/src/ejabberd_config.hrl b/src/ejabberd_config.hrl
new file mode 100644
index 000000000..bf953d808
--- /dev/null
+++ b/src/ejabberd_config.hrl
@@ -0,0 +1,15 @@
+%%%----------------------------------------------------------------------
+%%% File    : ejabberd_config.hrl
+%%% Author  : Mickael Remond <mickael.remond@process-one.net>
+%%% Purpose : ejabberd configuration internal data structures.
+%%% Created : 5 Nov 2007 by Mickael Remond <mickael.remond@process-one.net>
+%%% Id      : $Id: $
+%%%----------------------------------------------------------------------
+
+-record(config, {key, value}).
+-record(local_config, {key, value}).
+-record(state, {opts = [],
+		hosts = [],
+		override_local = false,
+		override_global = false,
+		override_acls = false}).