diff --git a/CMakeLists.txt b/CMakeLists.txt
index 568d8c1..285c2de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ foreach (AGENT antispam avirus imap pop queue rules smtp store)
 	add_subdirectory (src/agents/${AGENT})
 endforeach (AGENT)
 
-foreach (EXECUTABLE config manager testtool queuetool)
+foreach (EXECUTABLE config manager testtool queuetool storetool)
 	add_subdirectory (src/apps/${EXECUTABLE})
 endforeach (EXECUTABLE)
 
diff --git a/src/apps/storetool/CMakeLists.txt b/src/apps/storetool/CMakeLists.txt
new file mode 100644
index 0000000..bcc9e5b
--- /dev/null
+++ b/src/apps/storetool/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(DIRECTORY ./bongo
+    DESTINATION "${PYTHON_SITEPACKAGES_PATH}/"
+    FILES_MATCHING PATTERN "*.py"
+    PATTERN ".svn" EXCLUDE
+    )
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bongo-storetool.py ${CMAKE_CURRENT_BINARY_DIR}/bongo-storetool)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bongo-storetool DESTINATION ${SBIN_INSTALL_DIR} PERMISSIONS WORLD_EXECUTE)
diff --git a/src/apps/storetool/bongo-storetool.py b/src/apps/storetool/bongo-storetool.py
index 35880c9..adde1cf 100755
--- a/src/apps/storetool/bongo-storetool.py
+++ b/src/apps/storetool/bongo-storetool.py
@@ -2,6 +2,8 @@
 
 import logging, os, pwd, sys
 
+sys.path.insert(0, "${PYTHON_SITEPACKAGES_PATH}")
+
 from bongo.cmdparse import CommandParser, Command
 
 from bongo.storetool import BackupCommands
diff --git a/src/libs/python/bongo/CMakeLists.txt b/src/libs/python/bongo/CMakeLists.txt
index fca7db7..6ae24af 100644
--- a/src/libs/python/bongo/CMakeLists.txt
+++ b/src/libs/python/bongo/CMakeLists.txt
@@ -1,8 +1,12 @@
 # should look at doing a 'real' python install
 # http://www.python.org/doc/2.2.3/dist/setup-script.html
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Xpl.py.in ${CMAKE_CURRENT_BINARY_DIR}/Xpl.py)
+
 install(DIRECTORY ./ 
 	DESTINATION "${PYTHON_SITEPACKAGES_PATH}/bongo/" 
 	FILES_MATCHING PATTERN "*.py"
 	PATTERN ".svn" EXCLUDE
 	)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Xpl.py DESTINATION ${PYTHON_SITEPACKAGES_PATH}/bongo/)