diff --git a/TODO.txt b/TODO.txt
index e7a08a3d..7a637cde 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -139,7 +139,11 @@ other dev stuff
     Python code, and make them visible in the core wx namespace?  
     
   
-
+  * Should the demo/version.py file be maintained in the source repository?
+    Or just let it always be generated like wx/__version__.py?  
+    
+  * Should demo/Main.py ignore anything in the version strings after the '-' 
+    when comparing?
   
   
 
diff --git a/demo/Main.py b/demo/Main.py
index e816e052..98bade6e 100644
--- a/demo/Main.py
+++ b/demo/Main.py
@@ -1698,7 +1698,7 @@ class wxPythonDemo(wx.Frame):
         self.statusBar = self.CreateStatusBar(2)#, wx.ST_SIZEGRIP
         self.statusBar.SetStatusWidths([-2, -1])
 
-        statusText = "Welcome to wxPython %s"%version.VERSION_STRING
+        statusText = "Welcome to wxPython %s" % wx.VERSION_STRING
         self.statusBar.SetStatusText(statusText, 0)
 
         self.downloadGauge = wx.Gauge(self.statusBar, wx.ID_ANY, 50)
@@ -2206,7 +2206,7 @@ class wxPythonDemo(wx.Frame):
     #---------------------------------------------
     def OnTreeLeftDown(self, event):
         # reset the overview text if the tree item is clicked on again
-        pt = event.GetPosition();
+        pt = event.GetPosition()
         item, flags = self.tree.HitTest(pt)
         if item == self.tree.GetSelection():
             self.SetOverview(self.tree.GetItemText(item)+" Overview", self.curOverview)
diff --git a/demo/version.py b/demo/version.py
index ea7b8ac9..c5c2e93a 100644
--- a/demo/version.py
+++ b/demo/version.py
@@ -1,3 +1,3 @@
-# This file was generated by setup.py...
+# This file was generated by Phoenix's wscript.
 
-VERSION_STRING  = '2.9.5.81-r74150'
+VERSION_STRING = '2.9.5.81-r74165'
diff --git a/wscript b/wscript
index 2a194b90..4e0b3288 100644
--- a/wscript
+++ b/wscript
@@ -406,6 +406,12 @@ def build(bld):
         "SUBRELEASE_NUMBER = %(VER_SUBREL)s\n\n"
         "VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_NUMBER, SUBRELEASE_NUMBER, '%(VER_FLAGS)s')\n"
         % cfg.__dict__)
+    # and one for the demo folder too
+    open('demo/version.py', 'w').write(
+        "# This file was generated by Phoenix's wscript.\n\n"
+        "VERSION_STRING = '%(VERSION)s'\n"
+        % cfg.__dict__)
+        
 
     # copy the wx locale message catalogs to the package dir
     if isWindows or isDarwin: