diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..931181d4b1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ditto"]
+	path = ditto
+	url = ssh://git@git.zetetic.net/ditto
diff --git a/ditto b/ditto
new file mode 160000
index 0000000000..2a120798ce
--- /dev/null
+++ b/ditto
@@ -0,0 +1 @@
+Subproject commit 2a120798ce01c814b03b7f34058d524472103307
diff --git a/sqlcipher.xcodeproj/project.pbxproj b/sqlcipher.xcodeproj/project.pbxproj
index b15edccc5b..fd1b88f542 100644
--- a/sqlcipher.xcodeproj/project.pbxproj
+++ b/sqlcipher.xcodeproj/project.pbxproj
@@ -509,7 +509,11 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
+				HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)",
+					"$(OPENSSL_SRC)/include",
+					"$(DITTO_SRC)",
+				);
 				INSTALL_PATH = /usr/local/lib;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
@@ -536,7 +540,11 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
+				HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)",
+					"$(OPENSSL_SRC)/include",
+					"$(DITTO_SRC)",
+				);
 				INSTALL_PATH = /usr/local/lib;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
diff --git a/src/func.c b/src/func.c
index 45d960db52..0eb727955d 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1611,6 +1611,7 @@ static void groupConcatFinalize(sqlite3_context *context){
 ** of the built-in functions above are part of the global function set.
 ** This routine only deals with those that are not global.
 */
+#include "ditto/ditto_funcs.c"
 void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
   int rc = sqlite3_overload_function(db, "MATCH", 2);
 /* BEGIN SQLCIPHER */
@@ -1624,6 +1625,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
   if( rc==SQLITE_NOMEM ){
     sqlite3OomFault(db);
   }
+#include "ditto/ditto_globals.c"
 /* BEGIN SQLCIPHER */
 #ifdef SQLITE_HAS_CODEC
 #ifndef OMIT_EXPORT