diff --git a/.hgignore b/.hgignore
index da2faac1..6a0249d2 100644
--- a/.hgignore
+++ b/.hgignore
@@ -55,6 +55,7 @@ src/filters/rclexecm.pyc
 src/filters/rcllatinclass.pyc
 src/index/alldeps
 src/index/recollindex
+src/kde/kioslave/kio_recoll/builddir
 src/lib/alldeps
 src/lib/librcl.a
 src/mk/localdefs
diff --git a/packaging/debian/debiankio/rules b/packaging/debian/debiankio/rules
index a82d1f24..8d9a454d 100755
--- a/packaging/debian/debiankio/rules
+++ b/packaging/debian/debiankio/rules
@@ -3,4 +3,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 
-DEB_SRCDIR = kde/kioslave/recoll
+DEB_SRCDIR = kde/kioslave/kio_recoll
diff --git a/src/VERSION b/src/VERSION
index d3243490..04cc9994 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.15.5
+1.15.6
diff --git a/src/kde/kioslave/recoll/00README.txt b/src/kde/kioslave/kio_recoll/00README.txt
similarity index 100%
rename from src/kde/kioslave/recoll/00README.txt
rename to src/kde/kioslave/kio_recoll/00README.txt
diff --git a/src/kde/kioslave/recoll/CMakeLists.txt b/src/kde/kioslave/kio_recoll/CMakeLists.txt
similarity index 92%
rename from src/kde/kioslave/recoll/CMakeLists.txt
rename to src/kde/kioslave/kio_recoll/CMakeLists.txt
index 30899d85..467256bc 100644
--- a/src/kde/kioslave/recoll/CMakeLists.txt
+++ b/src/kde/kioslave/kio_recoll/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 set(rcltop ${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 
 # Execute minimum recoll configuration to create autoconfig.h and version.h
-execute_process(COMMAND ${rcltop}/configure --without-gui --enable-pic --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
+execute_process(COMMAND ${rcltop}/configure --disable-qtgui --disable-x11mon --enable-pic --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man
 		WORKING_DIRECTORY ${rcltop}
 )
 execute_process(COMMAND make common/rclversion.h
diff --git a/src/kde/kioslave/recoll/Makefile.kde3 b/src/kde/kioslave/kio_recoll/Makefile.kde3
similarity index 100%
rename from src/kde/kioslave/recoll/Makefile.kde3
rename to src/kde/kioslave/kio_recoll/Makefile.kde3
diff --git a/src/kde/kioslave/recoll/cleancmakestuff.sh b/src/kde/kioslave/kio_recoll/cleancmakestuff.sh
similarity index 100%
rename from src/kde/kioslave/recoll/cleancmakestuff.sh
rename to src/kde/kioslave/kio_recoll/cleancmakestuff.sh
diff --git a/src/kde/kioslave/recoll/data/help.html b/src/kde/kioslave/kio_recoll/data/help.html
similarity index 100%
rename from src/kde/kioslave/recoll/data/help.html
rename to src/kde/kioslave/kio_recoll/data/help.html
diff --git a/src/kde/kioslave/recoll/data/searchable.html b/src/kde/kioslave/kio_recoll/data/searchable.html
similarity index 100%
rename from src/kde/kioslave/recoll/data/searchable.html
rename to src/kde/kioslave/kio_recoll/data/searchable.html
diff --git a/src/kde/kioslave/recoll/data/welcome.html b/src/kde/kioslave/kio_recoll/data/welcome.html
similarity index 100%
rename from src/kde/kioslave/recoll/data/welcome.html
rename to src/kde/kioslave/kio_recoll/data/welcome.html
diff --git a/src/kde/kioslave/recoll/dirif.cpp b/src/kde/kioslave/kio_recoll/dirif.cpp
similarity index 100%
rename from src/kde/kioslave/recoll/dirif.cpp
rename to src/kde/kioslave/kio_recoll/dirif.cpp
diff --git a/src/kde/kioslave/recoll/htmlif.cpp b/src/kde/kioslave/kio_recoll/htmlif.cpp
similarity index 100%
rename from src/kde/kioslave/recoll/htmlif.cpp
rename to src/kde/kioslave/kio_recoll/htmlif.cpp
diff --git a/src/kde/kioslave/recoll/kio_recoll.cpp b/src/kde/kioslave/kio_recoll/kio_recoll.cpp
similarity index 100%
rename from src/kde/kioslave/recoll/kio_recoll.cpp
rename to src/kde/kioslave/kio_recoll/kio_recoll.cpp
diff --git a/src/kde/kioslave/recoll/kio_recoll.h b/src/kde/kioslave/kio_recoll/kio_recoll.h
similarity index 100%
rename from src/kde/kioslave/recoll/kio_recoll.h
rename to src/kde/kioslave/kio_recoll/kio_recoll.h
diff --git a/src/kde/kioslave/recoll/kio_recoll.la b/src/kde/kioslave/kio_recoll/kio_recoll.la
similarity index 100%
rename from src/kde/kioslave/recoll/kio_recoll.la
rename to src/kde/kioslave/kio_recoll/kio_recoll.la
diff --git a/src/kde/kioslave/recoll/notes.txt b/src/kde/kioslave/kio_recoll/notes.txt
similarity index 100%
rename from src/kde/kioslave/recoll/notes.txt
rename to src/kde/kioslave/kio_recoll/notes.txt
diff --git a/src/kde/kioslave/recoll/recoll.protocol b/src/kde/kioslave/kio_recoll/recoll.protocol
similarity index 100%
rename from src/kde/kioslave/recoll/recoll.protocol
rename to src/kde/kioslave/kio_recoll/recoll.protocol
diff --git a/src/kde/kioslave/recoll/recollf.protocol b/src/kde/kioslave/kio_recoll/recollf.protocol
similarity index 100%
rename from src/kde/kioslave/recoll/recollf.protocol
rename to src/kde/kioslave/kio_recoll/recollf.protocol
diff --git a/src/kde/kioslave/recoll/recollnolist.protocol b/src/kde/kioslave/kio_recoll/recollnolist.protocol
similarity index 100%
rename from src/kde/kioslave/recoll/recollnolist.protocol
rename to src/kde/kioslave/kio_recoll/recollnolist.protocol
diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh
index 1664ae40..3ca5c4c2 100644
--- a/src/makesrcdist.sh
+++ b/src/makesrcdist.sh
@@ -109,8 +109,8 @@ make distclean
 yes | clean.O
 rm -f lib/*.dep
 # Possibly clean up the cmake stuff
-(cd kde/kioslave/recoll/ || exit 1
-rm -rf CMakeCache.txt CMakeFiles/ CMakeTmp/ CPack* CTestTestfile.cmake cmake_* *automoc* lib)
+(cd kde/kioslave/kio_recoll/ || exit 1
+rm -rf CMakeCache.txt CMakeFiles/ CMakeTmp/ CPack* CTestTestfile.cmake cmake_* *automoc* lib builddir)
 
 $TAR chfX - excludefile .  | (cd $topdir;$TAR xf -)