diff --git a/Podfile b/Podfile
index 50701385..826862da 100644
--- a/Podfile
+++ b/Podfile
@@ -2,13 +2,16 @@ source 'https://github.com/cocoapods/specs.git'
 platform :ios, '11.0'
 use_frameworks!
 
+load 'Podfile.include'
+
+$tunnelkit_name = 'TunnelKit'
+$tunnelkit_specs = ['Core', 'AppExtension', 'LZO']
+#$tunnelkit_specs = ['OpenVPN', 'LZO']
+
 def shared_pods
-    pod 'TunnelKit', '~> 1.7.1'
-    pod 'TunnelKit/LZO', '~> 1.7.1'
-    #pod 'TunnelKit', :git => 'https://github.com/passepartoutvpn/tunnelkit', :commit => 'd06b2e1'
-    #pod 'TunnelKit/LZO', :git => 'https://github.com/passepartoutvpn/tunnelkit', :commit => 'd06b2e1'
-    #pod 'TunnelKit', :path => '../tunnelkit'
-    #pod 'TunnelKit/LZO', :path => '../tunnelkit'
+    by_version('~> 1.7.1', $tunnelkit_name, $tunnelkit_specs)
+    #by_git('d06b2e1', $tunnelkit_name, $tunnelkit_specs)
+    #by_path('..', $tunnelkit_name, $tunnelkit_specs)
     pod 'SSZipArchive'
 end
 
diff --git a/Podfile.include b/Podfile.include
new file mode 100644
index 00000000..999cd34d
--- /dev/null
+++ b/Podfile.include
@@ -0,0 +1,19 @@
+$git_root = "https://github.com/passepartoutvpn"
+
+def by_version(version, name, specs)
+    specs.each { |s|
+        pod "#{name}/#{s}", version
+    }
+end
+
+def by_git(sha, name, specs)
+    specs.each { |s|
+        pod "#{name}/#{s}", :git => "#{$git_root}/#{name.downcase}", :commit => sha
+    }
+end
+
+def by_path(root, name, specs)
+    specs.each { |s|
+        pod "#{name}/#{s}", :path => "#{root}/#{name.downcase}"
+    }
+end
diff --git a/Podfile.lock b/Podfile.lock
index b2854b99..6ef6df61 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -3,9 +3,6 @@ PODS:
   - OpenSSL-Apple (1.1.0j.2)
   - SSZipArchive (2.1.4)
   - SwiftyBeaver (1.7.0)
-  - TunnelKit (1.7.1):
-    - TunnelKit/AppExtension (= 1.7.1)
-    - TunnelKit/Core (= 1.7.1)
   - TunnelKit/AppExtension (1.7.1):
     - SwiftyBeaver
     - TunnelKit/Core
@@ -17,7 +14,8 @@ PODS:
 DEPENDENCIES:
   - MBProgressHUD
   - SSZipArchive
-  - TunnelKit (~> 1.7.1)
+  - TunnelKit/AppExtension (~> 1.7.1)
+  - TunnelKit/Core (~> 1.7.1)
   - TunnelKit/LZO (~> 1.7.1)
 
 SPEC REPOS:
@@ -35,6 +33,6 @@ SPEC CHECKSUMS:
   SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165
   TunnelKit: d1e02dea5cb58ea0d4dbfcdcb387e653d148d800
 
-PODFILE CHECKSUM: 6803ec63a9b690e4594f4a3954c271c559022574
+PODFILE CHECKSUM: 813756b522b60395c23ca318fdc98351fad17f8c
 
 COCOAPODS: 1.6.1