diff --git a/Podfile b/Podfile
index 666a2f5dc..c1da5a370 100644
--- a/Podfile
+++ b/Podfile
@@ -4,33 +4,62 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
 def shared_pods
+
+  ###
   # OWS Pods
+  ###
+
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', testspecs: ["Tests"]
   # pod 'SignalCoreKit', path: '../SignalCoreKit', testspecs: ["Tests"]
-  # pod 'SQLCipher', path: '../sqlcipher'
-  pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
-  # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
+
   pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'master', testspecs: ["Tests"]
   # pod 'AxolotlKit', path: '../SignalProtocolKit', testspecs: ["Tests"]
+
   pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', testspecs: ["Tests"]
   # pod 'HKDFKit', path: '../HKDFKit', testspecs: ["Tests"]
+
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', testspecs: ["Tests"]
   # pod 'Curve25519Kit', path: '../Curve25519Kit', testspecs: ["Tests"]
+
   pod 'SignalMetadataKit', git: 'https://github.com/signalapp/SignalMetadataKit', testspecs: ["Tests"]
   # pod 'SignalMetadataKit', path: '../SignalMetadataKit', testspecs: ["Tests"]
+
   pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
+
+  ###
+  # forked third party pods
+  ###
+
+  # Includes some soon to be released "unencrypted header" changes required for the Share Extension
+  pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
+  # pod 'SQLCipher', path: '../sqlcipher'
+
+  # Forked for performance optimizations that are not likely to be upstreamed as they are specific
+  # to our limited use of Mantle 
+  pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master'
+  # pod 'Mantle', path: '../Mantle'
+
+  # SocketRocket has some critical crash fixes on Github, but have published an official release to cocoapods in ages, so
+  # we were following master
+  # Forked and have an open PR with our changes, but they have not been merged.
+  # pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git', inhibit_warnings: true
+  pod 'SocketRocket', :git => 'https://github.com/signalapp/SocketRocket.git', branch: 'mkirk/handle-sec-err', inhibit_warnings: true
+
+  # Forked for compatibily with the ShareExtension, changes have an open PR, but have not been merged.
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
+  # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
+
+  # Forked to incorporate our self-built binary artifact.
   pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework'
   #pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'
 
+  ###
   # third party pods
+  ####
+
   pod 'AFNetworking', inhibit_warnings: true
-  pod 'Mantle', :inhibit_warnings => true
-  # pod 'YapDatabase/SQLCipher', :inhibit_warnings => true
   pod 'PureLayout', :inhibit_warnings => true
   pod 'Reachability', :inhibit_warnings => true
-  # pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git', inhibit_warnings: true
-  pod 'SocketRocket', :git => 'https://github.com/signalapp/SocketRocket.git', branch: 'mkirk/handle-sec-err', inhibit_warnings: true
   pod 'YYImage', :inhibit_warnings => true
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 72fc375fa..2c25f24bf 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -196,7 +196,7 @@ DEPENDENCIES:
   - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`)
   - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`)
   - HKDFKit/Tests (from `https://github.com/signalapp/HKDFKit.git`)
-  - Mantle
+  - Mantle (from `https://github.com/signalapp/Mantle`, branch `signal-master`)
   - PureLayout
   - Reachability
   - SignalCoreKit (from `https://github.com/signalapp/SignalCoreKit.git`)
@@ -216,7 +216,6 @@ SPEC REPOS:
     - AFNetworking
     - CocoaLumberjack
     - libPhoneNumber-iOS
-    - Mantle
     - PromiseKit
     - PureLayout
     - Reachability
@@ -235,6 +234,9 @@ EXTERNAL SOURCES:
     :git: https://github.com/signalapp/GRKOpenSSLFramework
   HKDFKit:
     :git: https://github.com/signalapp/HKDFKit.git
+  Mantle:
+    :branch: signal-master
+    :git: https://github.com/signalapp/Mantle
   SignalCoreKit:
     :git: https://github.com/signalapp/SignalCoreKit.git
   SignalMetadataKit:
@@ -264,8 +266,11 @@ CHECKOUT OPTIONS:
   HKDFKit:
     :commit: 3e0c2371d125f2d3db26daa498d5d436961b1795
     :git: https://github.com/signalapp/HKDFKit.git
+  Mantle:
+    :commit: 86be6280908291114bfacca7b765fe89bd5ca6e2
+    :git: https://github.com/signalapp/Mantle
   SignalCoreKit:
-    :commit: a84ec7ed6c13b079a7e03cb09c79b5452086d1e7
+    :commit: b575b9ce6a670964e1624f596dbf0aebcae82046
     :git: https://github.com/signalapp/SignalCoreKit.git
   SignalMetadataKit:
     :commit: 56f28fc3a6e35d548d034ef7d0009f233ca0aa62
@@ -303,6 +308,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: 0f765be42c3a325b23c9a59b52d35289bb6b067d
+PODFILE CHECKSUM: 1d3c7b17e2ff7bab54e3551c74559c26d95d9b06
 
 COCOAPODS: 1.5.3
diff --git a/Pods b/Pods
index 96cc3c16e..80ecd8861 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit 96cc3c16eb56a8bf416d91d6f06b47b06b02b9f0
+Subproject commit 80ecd88615e75d270f1aa5f5a0e8d6060cec334f