diff --git a/setup.py b/setup.py
index cfafe1a5..ce950552 100644
--- a/setup.py
+++ b/setup.py
@@ -87,12 +87,12 @@ class custom_install(install):
             os.chdir(work_path)
             hg_path = subprocess.Popen('which hg', stdout=subprocess.PIPE, shell=True).communicate()[0][:-1]
             #we are now in a temp dir, we can get the repositories
-            commands = ['%s clone http://hg.ik.nu/wokkel wokkel' % hg_path,
+            commands = ['%s clone http://hg.ik.nu/wokkel -r f9cd8ca1a62d' % hg_path,  #XXX: we use specific revision to avoid merge conflict
                         'cd wokkel',
-                        '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2' % hg_path,
+                        '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2  -r 1b19c49d30c2' % hg_path,
                         '%s merge wokkel-muc-client-support-24' % hg_path,
                         '%s commit -u "SàT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path,
-                        '%s setup.py install' % sys.executable]
+                        '%s setup.py %s' % (sys.executable, sys.argv[1:])]  #XXX: we use the same arguments as for this setup.py
             for command in commands:
                 if command.startswith('cd '):
                     os.chdir(command[3:])