diff --git a/.gitmodules b/.gitmodules
index 10c1abc9..5c21ca51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "CocoaHTTPServer"]
 	path = CocoaHTTPServer
 	url = git://github.com/robbiehanson/CocoaHTTPServer.git
+[submodule "KeePassKit"]
+	path = KeePassKit
+	url = https://mstarke@github.com/mstarke/KeePassKit
diff --git a/HNHUi b/HNHUi
index b1cfe0ed..a4186af4 160000
--- a/HNHUi
+++ b/HNHUi
@@ -1 +1 @@
-Subproject commit b1cfe0edc4d43334e4c53cc294493746cfbf59f9
+Subproject commit a4186af409bc28b1ebd9ba0559c68365b69cead9
diff --git a/KeePassKit b/KeePassKit
new file mode 160000
index 00000000..becc34d6
--- /dev/null
+++ b/KeePassKit
@@ -0,0 +1 @@
+Subproject commit becc34d6f15b8c14ebdf9a8020ac4b58002d55db
diff --git a/MiniKeePassLib b/MiniKeePassLib
index ee4352c9..4f62886e 160000
--- a/MiniKeePassLib
+++ b/MiniKeePassLib
@@ -1 +1 @@
-Subproject commit ee4352c9c5ce98ac8c00feb21e0961316a711fc8
+Subproject commit 4f62886e4ce92fa8a03528367d589d52d21c886a