Index: /trunk/src/VBox/ValidationKit/testboxscript/Makefile.kmk
===================================================================
--- /trunk/src/VBox/ValidationKit/testboxscript/Makefile.kmk	(revision 61594)
+++ /trunk/src/VBox/ValidationKit/testboxscript/Makefile.kmk	(revision 61595)
@@ -37,6 +37,8 @@
 testboxscript_EXEC_SOURCES = \
 	testboxscript.py \
-	testboxscript_real.py \
+	$(testboxscript_0_OUTDIR)/testboxscript_real.py \
 	setup.sh
+$(call VBOX_EDIT_VERSION_RULE_FN,testboxscript,testboxscript_real.py)
+
 testboxscript_SOURCES = \
 	testboxcommand.py \
Index: /trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py	(revision 61594)
+++ /trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py	(revision 61595)
@@ -183,5 +183,5 @@
                 self._ddSignOnParams[sItem][self.VALUE] = self._ddSignOnParams[sItem][self.FN]()
 
-        testboxcommons.log('Starting Test Box script (%s)' % __version__)
+        testboxcommons.log('Starting Test Box script (%s)' % (self._getScriptRev(),));
         testboxcommons.log('Test Manager URL: %s' % self._oOptions.sTestManagerUrl,)
         testboxcommons.log('Scratch root path: %s' % self._oOptions.sScratchRoot,)
@@ -590,5 +590,11 @@
         The script (subversion) revision number.
         """
-        return __version__[11:-1].strip();
+        sRev = '@VBOX_SVN_REV@';
+        sRev = sRev.strip();            # just in case...
+        try:
+            _ = int(sRev);
+        except:
+            return __version__[11:-1].strip();
+        return sRev;
 
     def _getPythonHexVersion(self):
@@ -690,4 +696,5 @@
                     raise Exception('Still exists after deletion, weird.');
             except Exception, oXcpt:
+                # pylint: disable=too-many-boolean-expressions
                 if    fUseTheForce is True \
                   and utils.getHostOs() not in ['win', 'os2'] \