diff -Nru vineyard-1.5.1~96~ubuntu14.04.1/debian/changelog vineyard-1.5.1~97~ubuntu14.04.1/debian/changelog
--- vineyard-1.5.1~96~ubuntu14.04.1/debian/changelog	2017-02-20 20:02:31.000000000 +0000
+++ vineyard-1.5.1~97~ubuntu14.04.1/debian/changelog	2017-02-22 16:16:58.000000000 +0000
@@ -1,8 +1,8 @@
-vineyard (1.5.1~96~ubuntu14.04.1) trusty; urgency=low
+vineyard (1.5.1~97~ubuntu14.04.1) trusty; urgency=low
 
   * Auto build.
 
- -- Christian Dannie Storgaard <cybolic@gmail.com>  Mon, 20 Feb 2017 20:02:31 +0000
+ -- Christian Dannie Storgaard <cybolic@gmail.com>  Wed, 22 Feb 2017 16:16:58 +0000
 
 vineyard (0.1.6) precise quantal raring saucy trusty utopic vivid wily xenial; urgency=medium
 
diff -Nru vineyard-1.5.1~96~ubuntu14.04.1/debian/git-build-recipe.manifest vineyard-1.5.1~97~ubuntu14.04.1/debian/git-build-recipe.manifest
--- vineyard-1.5.1~96~ubuntu14.04.1/debian/git-build-recipe.manifest	2017-02-20 20:02:31.000000000 +0000
+++ vineyard-1.5.1~97~ubuntu14.04.1/debian/git-build-recipe.manifest	2017-02-22 16:16:58.000000000 +0000
@@ -1,2 +1,2 @@
-# git-build-recipe format 0.4 deb-version 1.5.1~96
-lp:~cybolic/vineyard git-commit:4104ffbb0865032db549f52d448b4d246ee9c552
+# git-build-recipe format 0.4 deb-version 1.5.1~97
+lp:~cybolic/vineyard git-commit:fe8a112fb26165b4d370588e32f0372718fb5e29
diff -Nru vineyard-1.5.1~96~ubuntu14.04.1/vineyard-launcher vineyard-1.5.1~97~ubuntu14.04.1/vineyard-launcher
--- vineyard-1.5.1~96~ubuntu14.04.1/vineyard-launcher	2017-02-20 20:02:31.000000000 +0000
+++ vineyard-1.5.1~97~ubuntu14.04.1/vineyard-launcher	2017-02-22 16:16:58.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2007-2011 Christian Dannie Storgaard
@@ -268,17 +268,19 @@
         version_label.set_alignment(0.0, 0.5)
         self.version_value = gtk.combo_box_new_text()
         self._windowsversions = wine.version.windowsversions_sorted.copy()
+        default_windowsversion = wine.version.get_default()
         if 'win2008' in self._windowsversions:
             self._windowsversions['win2008'][0] = "Windows 7"
         windows_versions = [
-            _('%s (default)') % v[0] if k.endswith('xp') else v[0]
+            _('%s (default)') % v[0] if k == default_windowsversion else v[0]
             for (k,v) in self._windowsversions
+            if k is not "winxp64"  # python-wine knows to set "winxp" as "winxp64" on 64bit prefixes
         ]
         for version in windows_versions:
             self.version_value.append_text(version)
         vineyard.combobox_set_active_by_string(
             self.version_value,
-            "Windows XP",
+            self._windowsversions[default_windowsversion][0],
             startswith=True
         )
         self.table.attach(