diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e64c6c91..81fe61312 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,8 @@ add_executable(osrm-prepare ${PrepareSources} )
 add_executable(osrm-routed routed.cpp Util/GitDescription.cpp)
 set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED)
 
+add_executable(osrm-datastore datastore.cpp)
+
 file(GLOB DescriptorGlob Descriptors/*.cpp)
 file(GLOB DatastructureGlob Datastructures/*.cpp)
 file(GLOB LibOSRMGlob Library/*.cpp)
@@ -106,6 +108,7 @@ ENDIF( APPLE )
 target_link_libraries( osrm-extract ${Boost_LIBRARIES} UUID )
 target_link_libraries( osrm-prepare ${Boost_LIBRARIES} UUID )
 target_link_libraries( osrm-routed ${Boost_LIBRARIES} OSRM UUID )
+target_link_libraries( osrm-datastore ${Boost_LIBRARIES} UUID )
 
 find_package ( BZip2 REQUIRED )
 include_directories(${BZIP_INCLUDE_DIRS})
diff --git a/datastore.cpp b/datastore.cpp
new file mode 100644
index 000000000..944642a56
--- /dev/null
+++ b/datastore.cpp
@@ -0,0 +1,36 @@
+/*
+    open source routing machine
+    Copyright (C) Dennis Luxen, others 2010
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+ */
+
+#include "DataStructures/SharedMemoryFactory.h"
+#include "DataStructures/SharedMemoryVectorWrapper.h"
+#include "Util/SimpleLogger.h"
+#include "typedefs.h"
+
+int main(int argc, char * argv[]) {
+    try {
+        LogPolicy::GetInstance().Unmute();
+
+    } catch(const std::exception & e) {
+        SimpleLogger().Write(logWARNING) << "caught exception: " << e.what();
+
+    }
+
+    return 0;
+}