diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index fe13ff932d..f2aa7b04ec 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-28  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_server.spec,
+	  pandora_server_installer: Autocreate the conf and md5 subdirectories.
+
 2009-08-27  Ramon Novoa  <rnovoa@artica.es>
 
 	* util/tentacle_serverd: Remote config .conf and
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7f9c7198a6..7da98e96cd 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -50,6 +50,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin/
 mkdir -p $RPM_BUILD_ROOT/etc/init.d/
 mkdir -p $RPM_BUILD_ROOT/etc/pandora/
 mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in
+mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/conf
+mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in/md5
 mkdir -p $RPM_BUILD_ROOT/var/log/pandora/
 mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/
 mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/$perl_version/
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 919729b389..2e0f3def4e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -91,6 +91,8 @@ install () {
 		echo "Creating common Pandora FMS directories"
 		mkdir /var/spool/pandora 2> /dev/null
 		mkdir /var/spool/pandora/data_in 2> /dev/null
+		mkdir /var/spool/pandora/data_in/conf 2> /dev/null
+		mkdir /var/spool/pandora/data_in/md5 2> /dev/null
 		id pandora
 		if [ $? -eq 0 ]; then
 			echo " "