diff --git a/Podfile b/Podfile
index a0ab764d4..bef8dfdd0 100644
--- a/Podfile
+++ b/Podfile
@@ -8,7 +8,7 @@ def shared_pods
   # pod 'SQLCipher', path: '../sqlcipher2'
   pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
   # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/WhisperSystems/YapDatabase.git', branch: 'charlesmchen/unencryptedHeaders'
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/WhisperSystems/YapDatabase.git', branch: 'release/unencryptedHeaders'
   pod 'SignalServiceKit', path: '.'
   pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git', branch: 'mkirk/framework-friendly'
   #pod 'AxolotlKit', path: '../SignalProtocolKit'
diff --git a/Podfile.lock b/Podfile.lock
index 8ec433547..ec7bcd89f 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -141,7 +141,7 @@ DEPENDENCIES:
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
   - SQLCipher (from `https://github.com/sqlcipher/sqlcipher.git`, commit `d5c2bec`)
   - SSZipArchive
-  - YapDatabase/SQLCipher (from `https://github.com/WhisperSystems/YapDatabase.git`, branch `charlesmchen/unencryptedHeaders`)
+  - YapDatabase/SQLCipher (from `https://github.com/WhisperSystems/YapDatabase.git`, branch `release/unencryptedHeaders`)
   - YYImage
 
 EXTERNAL SOURCES:
@@ -167,7 +167,7 @@ EXTERNAL SOURCES:
     :commit: d5c2bec
     :git: https://github.com/sqlcipher/sqlcipher.git
   YapDatabase:
-    :branch: charlesmchen/unencryptedHeaders
+    :branch: release/unencryptedHeaders
     :git: https://github.com/WhisperSystems/YapDatabase.git
 
 CHECKOUT OPTIONS:
@@ -193,7 +193,7 @@ CHECKOUT OPTIONS:
     :commit: d5c2bec
     :git: https://github.com/sqlcipher/sqlcipher.git
   YapDatabase:
-    :commit: 373f0d4de7407068dcfac457be2cd8113c3b9b30
+    :commit: c58c6176941275c13ffe6ad697223e0cc3432928
     :git: https://github.com/WhisperSystems/YapDatabase.git
 
 SPEC CHECKSUMS:
@@ -221,6 +221,6 @@ SPEC CHECKSUMS:
   YapDatabase: 299a32de9d350d37a9ac5b0532609d87d5d2a5de
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: a1bdffc2e8729b9e1b1b91e5ef69a58f753fee3a
+PODFILE CHECKSUM: 0d804514eb2db34b9874b653e543255d8c2f5751
 
 COCOAPODS: 1.3.1