diff --git a/DEMO/demo.sql b/DEMO/demo.sql
index 4de4c8c9f..a484d17bb 100644
--- a/DEMO/demo.sql
+++ b/DEMO/demo.sql
@@ -6,9 +6,19 @@
 --
 -- Support: +31 53 4800700
 
-set echo on
+DEFINE thisfile = 'DEMO.SQL'
+DEFINE dbuser   = '^DEMO'
 
-spool xdemo.lst
+SET ECHO ON
+SET DEFINE ON
+COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
+WHENEVER SQLERROR EXIT;
+SELECT adm.scriptspoolfile('&dbuser', '&thisfile') AS fcltlogfile FROM DUAL;
+WHENEVER SQLERROR CONTINUE;
+SPOOL &fcltlogfile
+SET DEFINE OFF
+
+------ payload begin ------
 
 CREATE OR REPLACE VIEW curs_v_rap_infobord (
    item_type,
@@ -4832,6 +4842,14 @@ BEGIN adm.systrackscriptId('$Id$'); END;
 BEGIN fac.registercustversion('DEMO', 7); END;
 /
 
-COMMIT;
+------ payload end   ------
 
+SET DEFINE OFF
+BEGIN adm.systrackscriptId ('$Id$', 0); END;
+/
+
+COMMIT;
+SET ECHO OFF
 SPOOL OFF
+SET DEFINE ON
+PROMPT Logfile of this upgrade is: &fcltlogfile