diff --git a/GDFS/gdfs.sql b/GDFS/gdfs.sql
index caf6e8b75..f53061743 100644
--- a/GDFS/gdfs.sql
+++ b/GDFS/gdfs.sql
@@ -5,9 +5,25 @@
 --
 -- Support: +31 53 4800700
 
+DEFINE thisfile = 'GDFS.SQL'
+DEFINE dbuser   = 'GDFS'
 
-SPOOL xGDFS.LST
 SET ECHO ON
+SET DEFINE ON
+COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
+COLUMN fcltcusttxt NEW_VALUE fcltcusttxt NOPRINT;
+WHENEVER SQLERROR CONTINUE;
+SELECT adm.getscriptspoolfile('&thisfile') AS fcltlogfile FROM DUAL;
+SPOOL &fcltlogfile
+WHENEVER SQLERROR EXIT;
+SELECT adm.checkscriptcust('&dbuser') AS fcltcusttxt FROM DUAL;
+WHENEVER SQLERROR CONTINUE;
+---------------------------------------
+PROMPT &fcltcusttxt
+---------------------------------------
+SET DEFINE OFF
+
+------ payload begin ------
 
 CREATE OR REPLACE PACKAGE gdfs
 AS
@@ -42,11 +58,11 @@ AS
 
          -- als v_tot gelijk is aan 0 dan zitten we op het einde van de string. Geef
          -- dan alles maar terug tot het einde van de string (maar even op 1000 gezet.
-         IF v_tot = 0 
-         THEN 
-            v_tot := 1000; 
+         IF v_tot = 0
+         THEN
+            v_tot := 1000;
          END IF;
-          
+
          RETURN SUBSTR (p_string, v_van + 1, v_tot - v_van - 1);
       ELSE
          RETURN NULL;
@@ -490,6 +506,8 @@ AS
 BEGIN
    DELETE gdfs_autorit_registratie;
 
+   RETURN; -- GDFS#73348 Autorittenregistratie wordt niet meer gebruikt.
+
    FOR rec IN c
    LOOP
       BEGIN
@@ -595,10 +613,14 @@ AS
      FROM gdfs_autorit_registratie a, ins_deel d
     WHERE a.ins_deel_key = d.ins_deel_key;
 
-BEGIN fac.registercustversion('GDFS', 7); END;
-/
-BEGIN adm.systrackscriptId('$Id$', 0); 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