diff --git a/contrib/make_osx b/contrib/make_osx
new file mode 100644
index 00000000..1a69892b
--- /dev/null
+++ b/contrib/make_osx
@@ -0,0 +1,6 @@
+#!/bin/bash
+rm -rf dist
+VERSION=`git describe --tags`
+python2 setup-release.py py2app
+hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-$VERSION.dmg
+
diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
index edfe318e..879bf8b4 100644
--- a/plugins/trezor/plugin.py
+++ b/plugins/trezor/plugin.py
@@ -193,8 +193,11 @@ class TrezorCompatiblePlugin(HW_PluginBase):
 
         if method == TIM_NEW:
             strength = 64 * (item + 2)  # 128, 192 or 256
+            u2f_counter = 0
+            skip_backup = False
             client.reset_device(True, strength, passphrase_protection,
-                                    pin_protection, label, language)
+                                pin_protection, label, language,
+                                u2f_counter, skip_backup)
         elif method == TIM_RECOVER:
             word_count = 6 * (item + 2)  # 12, 18 or 24
             client.step = 0