diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec
index e97eb76ff..d33b505f3 100644
--- a/iOS/FlipperKit.podspec
+++ b/iOS/FlipperKit.podspec
@@ -49,7 +49,7 @@ Pod::Spec.new do |spec|
   spec.subspec "FKPortForwarding" do |ss|
     ss.header_dir = "FKPortForwarding"
     ss.dependency 'CocoaAsyncSocket', '~> 7.6'
-    ss.dependency 'PeerTalk', '~>0.0.2'
+    ss.dependency 'Flipper-PeerTalk', '~>0.0.4'
     ss.compiler_flags = folly_compiler_flags
     ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}'
     ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h'
@@ -83,7 +83,7 @@ Pod::Spec.new do |spec|
                              'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h',
                              'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h',
                              'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h'
-    header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\""
+    header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\""
     ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                              "DEFINES_MODULE" => "YES",
                              "HEADER_SEARCH_PATHS" => header_search_paths }
diff --git a/iOS/Podfile b/iOS/Podfile
index 825c51915..0640e62b9 100644
--- a/iOS/Podfile
+++ b/iOS/Podfile
@@ -10,7 +10,7 @@ target 'FlipperKit' do
   project 'FlipperKit.xcodeproj'
   pod 'Flipper', :path => '../Flipper.podspec'
   # Pods for SonarKit
-  pod 'PeerTalk', '~>0.0'
+  pod 'Flipper-PeerTalk', '~>0.0'
   pod 'Flipper-RSocket', '~>0.10'
   pod 'DoubleConversion', '~>1.1'
   pod 'glog', '~>0.3'
diff --git a/iOS/Podspecs/Flipper-PeerTalk.podspec b/iOS/Podspecs/Flipper-PeerTalk.podspec
new file mode 100644
index 000000000..bc08a3104
--- /dev/null
+++ b/iOS/Podspecs/Flipper-PeerTalk.podspec
@@ -0,0 +1,18 @@
+Pod::Spec.new do |spec|
+    spec.name     = 'Flipper-PeerTalk'
+    spec.version  = '0.0.4'
+    spec.license  = { :type => 'MIT' }
+    spec.homepage = 'http://rsms.me/peertalk/'
+    spec.authors  = { 'Rasmus Andersson' => 'rasmus@notion.se' }
+    spec.summary  = 'iOS and OS X Cocoa library for communicating over USB and TCP.'
+
+    spec.source   = { :git => "https://github.com/priteshrnandgaonkar/peertalk.git",
+                      :tag => "v0.0.3" }
+    spec.source_files = 'peertalk/*.{h,m}'
+    spec.requires_arc = true
+    spec.ios.deployment_target = '8.4'
+    spec.osx.deployment_target = '10.10'
+    spec.header_mappings_dir = 'peertalk'
+    spec.header_dir = 'peertalk'
+   spec.description = "                    PeerTalk is a iOS and OS X Cocoa library for communicating over USB and TCP.\n\n                    Highlights:\n\n                    * Provides you with USB device attach/detach events and attached device's info\n                    * Can connect to TCP services on supported attached devices (e.g. an iPhone), bridging the communication over USB transport\n                    * Offers a higher-level API (PTChannel and PTProtocol) for convenient implementations.\n                    * Tested and designed for libdispatch (aka Grand Central Dispatch).\n"
+end
diff --git a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj
index f9f2e618d..2aa99988b 100644
--- a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj
+++ b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj
@@ -357,7 +357,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"PeerTalk\"",
 					"-l\"crypto\"",
 					"-l\"event\"",
 					"-l\"event_core\"",
@@ -411,7 +410,6 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
-					"-l\"PeerTalk\"",
 					"-l\"crypto\"",
 					"-l\"event\"",
 					"-l\"event_core\"",