diff --git a/SKAF/skaf.sql b/SKAF/skaf.sql
index 8eb530bdd..434d146ca 100644
--- a/SKAF/skaf.sql
+++ b/SKAF/skaf.sql
@@ -5,9 +5,20 @@
 --
 -- Support: +31 53 4800710
 
-set echo on
+DEFINE thisfile = 'SKAF.SQL'
+DEFINE dbuser   = '^SKAF'
+
+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 ------
 
-spool skaf.lst
 
 CREATE OR REPLACE VIEW skaf_v_import_log
 AS
@@ -2290,4 +2301,4 @@ COMMIT;
 SET ECHO OFF
 SPOOL OFF
 SET DEFINE ON
-PROMPT Logfile of this upgrade is: &fcltlogfile
\ No newline at end of file
+PROMPT Logfile of this upgrade is: &fcltlogfile