diff --git a/WAPT/control b/WAPT/control
index 402280b..9b6f224 100644
--- a/WAPT/control
+++ b/WAPT/control
@@ -1,11 +1,11 @@
 package           : fws-thunderbird-sogo-addons
-version           : 60.0.0-1
+version           : 60.0.0-2
 architecture      : all
 section           : base
 priority          : optional
 maintainer        : Daniel Berteaud <daniel@firewall-services.com>
 description       : SOGo addons for Thunderbird
-depends           : fws-thunderbird-config,fws-7zip
+depends           : fws-thunderbird-config
 conflicts         : 
 maturity          : DEV
 locale            : 
diff --git a/setup.py b/setup.py
index 98ba243..28219c2 100644
--- a/setup.py
+++ b/setup.py
@@ -26,10 +26,10 @@ def install():
         mkdirs(makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-%s@inverse.ca' % extension))
 
     # connector can be extracted as is
-    run('"%s" x -y -o"%s" sogo-connector-%s.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca'), connector_version))
+    unzip('sogo-connector-%s.xpi' % connector_version, makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-connector@inverse.ca'))
 
     # Integrator must be customized, so first extract it
-    run('"%s" x -y -o"%s" sogo-integrator-%s-sogo-demo.xpi' % (makepath(programfiles,'7-Zip','7z.exe'), makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca'), integrator_version))
+    unzip('sogo-integrator-%s-sogo-demo.xpi' % integrator_version, makepath(programfiles,'Mozilla Thunderbird','distribution','extensions','sogo-integrator@inverse.ca'))
     # And replace the extensions.rdf content
     jinja2 = Environment(
         loader=FileSystemLoader(os.path.dirname(os.path.abspath(__file__))),