diff --git a/WAPT/control b/WAPT/control
new file mode 100644
index 0000000..e844001
--- /dev/null
+++ b/WAPT/control
@@ -0,0 +1,32 @@
+package           : fws-openvpn
+version           : 2.4.6-6
+architecture      : all
+section           : base
+priority          : optional
+maintainer        : Daniel Berteaud <daniel@firewall-services.com>
+description       : OpenVPN client
+depends           : 
+conflicts         : 
+maturity          : DEV
+locale            : all
+target_os         : windows
+min_os_version    : 6.0
+max_os_version    : 
+min_wapt_version  : 1.5
+sources           : 
+installed_size    : 
+impacted_process  : 
+description_fr    : Client OpenVPN
+description_pl    : 
+description_de    : 
+description_es    : 
+audit_schedule    : 2d
+editor            : OpenVPN
+keywords          : vpn
+licence           : GNU GPL
+homepage          : https://openvpn.net
+package_uuid      : 
+signer            : Daniel Berteaud
+signer_fingerprint: 
+signature_date    : 
+signed_attributes : 
\ No newline at end of file
diff --git a/WAPT/icon.png b/WAPT/icon.png
new file mode 100644
index 0000000..d124ee2
Binary files /dev/null and b/WAPT/icon.png differ
diff --git a/WAPT/wapt.psproj b/WAPT/wapt.psproj
new file mode 100644
index 0000000..29acc4b
--- /dev/null
+++ b/WAPT/wapt.psproj
@@ -0,0 +1,295 @@
+[PyScripter]
+Version=3.3.2.0
+
+[Project]
+ClassName=TProjectRootNode
+StoreRelativePaths=TRUE
+ShowFileExtensions=FALSE
+
+[Project\ChildNodes\Node0]
+ClassName=TProjectFilesNode
+
+[Project\ChildNodes\Node0\ChildNodes\Node0]
+ClassName=TProjectFolderNode
+Name=wapt
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\common.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\setuphelpers.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\wapt-get.ini
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\wapt-get.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
+ClassName=TProjectFileNode
+FileName=C:\Program Files (x86)\wapt\waptpackage.py
+
+[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
+Count=5
+
+[Project\ChildNodes\Node0\ChildNodes\Node1]
+ClassName=TProjectFileNode
+FileName=$[Project-Path]changelog.txt
+
+[Project\ChildNodes\Node0\ChildNodes\Node2]
+ClassName=TProjectFileNode
+FileName=$[Project-Path]control
+
+[Project\ChildNodes\Node0\ChildNodes\Node3]
+ClassName=TProjectFileNode
+FileName=$[Project-Path]..\setup.py
+
+[Project\ChildNodes\Node0\ChildNodes]
+Count=4
+
+[Project\ChildNodes\Node1]
+ClassName=TProjectRunConfiguationsNode
+
+[Project\ChildNodes\Node1\ChildNodes\Node0]
+ClassName=TProjectRunConfiguationNode
+Name=install
+
+[Project\ChildNodes\Node1\ChildNodes\Node0\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=install "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node0\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node1]
+ClassName=TProjectRunConfiguationNode
+Name=remove
+
+[Project\ChildNodes\Node1\ChildNodes\Node1\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=remove "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node1\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node2]
+ClassName=TProjectRunConfiguationNode
+Name=session-setup
+
+[Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=session-setup "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node2\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node3]
+ClassName=TProjectRunConfiguationNode
+Name=update
+
+[Project\ChildNodes\Node1\ChildNodes\Node3\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=update
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node3\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node4]
+ClassName=TProjectRunConfiguationNode
+Name=upgrade
+
+[Project\ChildNodes\Node1\ChildNodes\Node4\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=-f upgrade
+WorkingDir=$[ActiveScript-Dir]
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node4\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node5]
+ClassName=TProjectRunConfiguationNode
+Name=-i build-upload
+
+[Project\ChildNodes\Node1\ChildNodes\Node5\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=-i build-upload "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node5\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node6]
+ClassName=TProjectRunConfiguationNode
+Name=svn update
+
+[Project\ChildNodes\Node1\ChildNodes\Node6\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=sources "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node6\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node7]
+ClassName=TProjectRunConfiguationNode
+Name=uninstall
+
+[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=uninstall "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node7\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[Project-Path]..
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node8]
+ClassName=TProjectRunConfiguationNode
+Name=update-package-sources
+
+[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=update-package-sources "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node8\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes\Node9]
+ClassName=TProjectRunConfiguationNode
+Name=audit
+
+[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig]
+ScriptName=C:\Program Files (x86)\wapt\wapt-get.py
+EngineType=peRemote
+ReinitializeBeforeRun=TRUE
+Parameters=audit "$[Project-Path].."
+WorkingDir=$[Project-Path]..
+WriteOutputToFile=FALSE
+OutputFileName=$[ActiveScript-NoExt].log
+AppendToFile=FALSE
+
+[Project\ChildNodes\Node1\ChildNodes\Node9\RunConfig\ExternalRun]
+Caption=External Run
+Description=Run script using an external Python Interpreter
+ApplicationName=$[PythonExe-Short]
+Parameters=$[ActiveScript-Short]
+WorkingDirectory=$[ActiveScript-Dir]
+ShortCut=0
+MessagesFormat=$[FileName] $[LineNumber]
+
+[Project\ChildNodes\Node1\ChildNodes]
+Count=10
+
+[Project\ChildNodes]
+Count=2
+
+[Project\ExtraPythonPath]
+Count=0
+
diff --git a/openvpn-install-2.4.6-I602.exe b/openvpn-install-2.4.6-I602.exe
new file mode 100644
index 0000000..fffe7c2
Binary files /dev/null and b/openvpn-install-2.4.6-I602.exe differ
diff --git a/openvpn.p7b b/openvpn.p7b
new file mode 100644
index 0000000..b20be09
Binary files /dev/null and b/openvpn.p7b differ
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..bbf3a86
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+from setuphelpers import *
+
+uninstallkey = []
+variables = {}
+
+# Read local variables file if available
+if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')):
+    print('Reading local encrypted variables file')
+    from cryptography.fernet import Fernet
+    import yaml
+    f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
+    variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
+
+def install():
+    version = control['version'].split('-',1)[0]
+
+    print('Register OpenVPN as a trusted publisher')
+    run(r'certutil.exe -addstore trustedpublisher openvpn.p7b')
+
+    print('Installing OpenVPN client')
+    install_exe_if_needed('openvpn-install-%s-I602.exe' % version,'/S',key='OpenVPN',min_version='%s-I602' % version,killbefore=['openvpn','openvpn-gui'])
+    uninstallkey.append('TAP-Windows')
+
+    if 'openvpn_config' in variables:
+        print('Deploying client configuration')
+        open(makepath(programfiles,'OpenVPN','config','vpn.ovpn'),'w').write(variables['openvpn_config'])
+
+def update_package():
+    import re, os
+    from waptpackage import PackageEntry
+    print('Updating OpenVPN package')
+    page = wgets('https://openvpn.net/community-downloads/')
+    latest_version = re.search('OpenVPN (\d+(\.\d+)*) .* released on', page).group(1)
+    pe = PackageEntry()
+    control = pe.load_control_from_wapt(os.getcwd())
+    current_version = control['version'].split('-',1)[0]
+    if Version(latest_version) > Version(current_version):
+        print('Updating Package from %s to %s' % (current_version, latest_version))
+        if not isfile('openvpn-install-%s-I602.exe' % latest_version):
+            url = 'https://swupdate.openvpn.org/community/releases/openvpn-install-%s-I602.exe' % latest_version
+            print('downloading %s' % url)
+            wget(url, os.getcwd())
+        for file in glob.glob('*.exe'):
+            if file != 'openvpn-install-%s-I602.exe' % latest_version:
+                print('Removing %s' % file)
+                remove_file(file)
+        pe.version = latest_version + '-0'
+        pe.save_control_to_wapt(os.getcwd())
+        print('Package updated to %s' % latest_version)
+    else:
+        print('No update available')
+
+
+if __name__ == '__main__':
+    update_package()
+