diff --git a/Makefile.in b/Makefile.in
index c83c10b1ea25b058df2acc8fb3265bb944e0dd80..76326f94c772703d5cfc0d757315264a3a95a041 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ tarball: all
 	mkdir -p build/etc
 	$(MAKE) -C src install DESTDIR=`pwd`/build prefix="" 
 	$(MAKE) -C modules install DESTDIR=`pwd`/build prefix="" 
+	$(MAKE) -C config install DESTDIR=`pwd`/build prefix="" 
 	tar czf build/mpi-start-$(VERSION).tar.gz -C build bin etc
 
 DISTFILES=src\
diff --git a/config/mpi-config.local.debian b/config/mpi-config.debian
similarity index 100%
rename from config/mpi-config.local.debian
rename to config/mpi-config.debian
diff --git a/config/mpi-config.local.el5-i386 b/config/mpi-config.el5-i386
similarity index 100%
rename from config/mpi-config.local.el5-i386
rename to config/mpi-config.el5-i386
diff --git a/config/mpi-config.local.el5-x86_64 b/config/mpi-config.el5-x86_64
similarity index 100%
rename from config/mpi-config.local.el5-x86_64
rename to config/mpi-config.el5-x86_64
diff --git a/config/mpi-config.local.el6-i386 b/config/mpi-config.el6-i386
similarity index 100%
rename from config/mpi-config.local.el6-i386
rename to config/mpi-config.el6-i386
diff --git a/config/mpi-config.local.el6-x86_64 b/config/mpi-config.el6-x86_64
similarity index 100%
rename from config/mpi-config.local.el6-x86_64
rename to config/mpi-config.el6-x86_64
diff --git a/mpi-start.spec.in b/mpi-start.spec.in
index 12696bda0a3ad45618c617dea73620151f3b8851..76cfaf52d967e01a79003f006662d1869592070c 100644
--- a/mpi-start.spec.in
+++ b/mpi-start.spec.in
@@ -40,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mpi-start
 %config(noreplace) %{_sysconfdir}/mpi-start/*.local
 %{_sysconfdir}/mpi-start/*.filedist
+%{_sysconfdir}/mpi-start/mpi-config.*
 %{_sysconfdir}/mpi-start/*.hook
 %{_sysconfdir}/mpi-start/*.mpi
 %{_sysconfdir}/mpi-start/*.scheduler
@@ -50,10 +51,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/AUTHORS docs/COPYING docs/LICENSE README ChangeLog
 
 %changelog
-* Tue Jul 30 2013 Enol Fernandez <enolfc _AT_ ifca.unican.es> - 1.5.2-%{release}
+* Wed Aug 28 2013 Enol Fernandez <enolfc _AT_ ifca.unican.es> - 1.5.2-%{release}
 - Migrated to github.
 - Fix issue #1 (OSC mpiexec with mpich configuration)
 - Fix issue #2 (ssh copy fails if hostname command returns hostname with domain)
+- Fix issue #6 (Default mpi configuration should be detected by the runtime)
 
 * Wed Oct 31 2012 Enol Fernandez <enolfc _AT_ ifca.unican.es> - 1.5.1-1%{?dist}
 - Improved packaging.
diff --git a/src/mpi-start.in b/src/mpi-start.in
index c744f9994d069ef76db98a392624fa942e2f5dc3..3212d72f886c23192ff808be8f878cc2a5c2ae8e 100755
--- a/src/mpi-start.in
+++ b/src/mpi-start.in
@@ -487,7 +487,7 @@ mpi_start_detect_os() {
             if test $? -eq 0 ; then
                 export MPI_START_OS_DIST_TYPE="debian"
             fi
-            echo $MPI_START_OS_DIST | egrep -i "redhat|scientificlinux" > /dev/null 
+            echo $MPI_START_OS_DIST | egrep -i "redhat|scientific" > /dev/null 
             if test $? -eq 0 ; then
                 export MPI_START_OS_DIST_TYPE="el"
             fi