diff --git a/picard/ui/util.py b/picard/ui/util.py
index db5fed7ee..31599bf13 100644
--- a/picard/ui/util.py
+++ b/picard/ui/util.py
@@ -20,6 +20,7 @@
 import sys
 from PyQt4 import QtGui
 
+
 class StandardButton(QtGui.QPushButton):
 
     OK = 0
@@ -41,3 +42,4 @@ class StandardButton(QtGui.QPushButton):
                 icon = self.tagger.style().standardIcon(getattr(QtGui.QStyle, iconname))
                 args = [icon, label]
         QtGui.QPushButton.__init__(self, *args)
+
diff --git a/setup.py b/setup.py
index be55ee56b..8a4f06411 100755
--- a/setup.py
+++ b/setup.py
@@ -425,7 +425,7 @@ try:
     }]
     args['options'] = {
         'py2exe': {
-            'includes': [e.name for e in ext_modules],
+            'bdist_nsis': [e.name for e in ext_modules],
         },
     }
 except ImportError: