diff --git a/gcom2.f90 b/gcom2.f90
index 862b7aad2..995e685e4 100644
--- a/gcom2.f90
+++ b/gcom2.f90
@@ -94,6 +94,7 @@ character utcdate*12   !UTC date                                GUI
 character*24 fname0    !Filenames to be recorded, read, ...     Decoder
 character*24 fnamea
 character*24 fnameb
+character*6  fnamedate
 character*24 decodedfile
 character*80 AppDir      !WSJT installation directory           GUI
 character*80 AzElDir     !Directory for azel.dat                GUI
@@ -115,8 +116,8 @@ common/gcom2/fcenter,ps0(431),psavg(450),s2(64,3100),ccf(-5:540),           &
      idinterval,msmax,lenappdir,idf,ndiskdat,nlines,nflat,ntxreq,ntxnow,    &
      ndepth,nspecial,ndf,nfmid,nfrange,ss1(-224:224),ss2(-224:224),         &
      mycall,hiscall,hisgrid,txmsg,sending,mode,fname0,fnamea,               &
-     fnameb,decodedfile,AppDir,AzElDir,SaveDir,filetokilla,filetokillb,     &
-     utcdate,pttport,utcdata
+     fnameb,fnamedate,decodedfile,AppDir,AzElDir,SaveDir,                   &
+     filetokilla,filetokillb,utcdate,pttport,utcdata
 
 !### volatile /gcom2/
 
diff --git a/map65.py b/map65.py
index c6f2f2eac..51302d7b5 100644
--- a/map65.py
+++ b/map65.py
@@ -967,6 +967,8 @@ def update():
 
     if isec != isec0:                           #Do once per second
         isec0=isec
+        t=time.strftime('%y%m%d',utc)
+        Audio.gcom2.fnamedate=t[:6]
         t=time.strftime('%Y %b %d\n%H:%M:%S',utc)
         Audio.gcom2.utcdate=t[:12]
         ldate.configure(text=t)
diff --git a/map65a.F90 b/map65a.F90
index 2f7bc9f0b..af8d0d76c 100644
--- a/map65a.F90
+++ b/map65a.F90
@@ -366,8 +366,8 @@ subroutine map65a(newdat)
   call display(nkeep,ncsmin)
   ndecdone=2
 
-  if(nsave.gt.0 .and. ndiskdat.eq.0) call savetf2(id(1,1,kbuf),nsave,   &
-       ntime,nutc,savedir)
+  if(nsave.gt.0 .and. ndiskdat.eq.0) call savetf2(id(1,1,kbuf),       &
+       fnamedate,savedir)
 
 999 close(23)
   ndphi=0
diff --git a/savetf2.F90 b/savetf2.F90
index 4206d2b10..ad04ed6cd 100644
--- a/savetf2.F90
+++ b/savetf2.F90
@@ -1,95 +1,42 @@
-subroutine savetf2(id,nsave,ntime,nutc,savedir)
-
-#ifdef CVF
-  use dfport
-#endif
+subroutine savetf2(id,fnamedate,savedir)
 
   parameter (NZ=60*96000)
   parameter (NSPP=174)
   parameter (NPKTS=NZ/NSPP)
   integer*2 id(4,NZ)
-  real*4 ss(NPKTS),ss2(60)
-  real*8 dt,t,t2
   character*80 savedir,fname
-  character cdate*8,ctime2*10,czone*5
-  integer it(9),itt(8)
+  character cdate*8,ctime2*10,czone*5,fnamedate*6
+  integer  itt(8)
 
-  if(nsave.eq.1) then
-#ifdef CVF
-     n2=ntime/60
-     n3=(n2-1)*60
-     call gmtime(n3,it)
-     it(5)=it(5)+1
-#else
-     call date_and_time(cdate,ctime2,czone,itt)
-     it(6)=itt(1)
-     it(5)=itt(2)
-     it(4)=itt(3)
-     it(3)=itt(5)-itt(4)/60
-     if(it(3).lt.0) it(3)=it(3)+24
-     if(it(3).ge.24) it(3)=it(3)-24
-     it(2)=itt(6)
-     !  it(1)=itt(7)
-     it(1)=0
-#endif
-     it(6)=mod(it(6),100)
-     write(fname,1000) (it(j),j=6,2,-1)
-1000 format('/',3i2.2,'_',2i2.2,'.tf2')
-     do i=80,1,-1
-        if(savedir(i:i).ne.' ') go to 1
-     enddo
-
-1    iz=i
-     fname=savedir(1:iz)//fname
-#ifdef CVF
-     open(17,file=fname,status='unknown',form='binary',err=998)
-#else
-     open(17,file=fname,status='unknown',access='stream',err=998)
-#endif
-     write(17) id
-     close(17)
-
-
-  else
-     dt=NSPP/96000.d0
-     t=0.d0
-     nh=nutc/100
-     nm=mod(nutc,100)
-     t2=3600*nh + 60*nm
-     fac=1.0/(4.0*NSPP)
-     do i=1,NPKTS
-        s=0.
-        do n=1,NSPP
-           s=s + float(int(id(1,i)))**2 + float(int(id(2,i)))**2 +     &
-                float(int(id(3,i)))**2 + float(int(id(4,i)))**2 
-        enddo
-        ss(i)=fac*s
-        t=t+dt
-        t2=t2+dt
-        if(nsave.eq.3) write(24,1010) t,t2,ss(i)
-1010    format(f9.6,f15.6,f10.3)
-     enddo
-
-     if(nsave.eq.2) then
-        dt2=551*dt
-        t=0.d0
-        t2=3600*nh + 60*nm
-        k=0
-        do i=1,60
-           s=0.
-           ns=0
-           do n=1,551
-              k=k+1
-              s=s + ss(k)
-              if(ss(k).gt.0.0) ns=ns+1
-           enddo
-           ss2(i)=s/ns
-           t=t+dt
-           t2=t2+dt2
-           write(25,1010) t,t2,ss2(i)
-        enddo
-     endif
+  call date_and_time(cdate,ctime2,czone,itt)
+  nh=itt(5)-itt(4)/60
+  nm=itt(6)
+  ns=itt(7)
+  if(ns.lt.50) nm=nm-1
+  if(nm.lt.0) then
+     nm=nm+60
+     nh=nh-1
   endif
+  if(nh.lt.0) nh=nh+24
+  if(nh.ge.24) nh=nh-24
+  write(fname,1001) fnamedate,nh,nm
+1001 format('/',a6,'_',2i2.2,'.tf2')
+  do i=80,1,-1
+     if(savedir(i:i).ne.' ') go to 1
+  enddo
+1 iz=i
+  fname=savedir(1:iz)//fname
+#ifdef CVF
+  open(17,file=fname,status='unknown',form='binary',err=998)
+#else
+  open(17,file=fname,status='unknown',access='stream',err=998)
+#endif
+  write(17,err=997) id
+  close(17)
+  go to 999
+
+997 print*,'Error writing tf2 file'
+  print*,fname
   go to 999
 
 998 print*,'Cannot open file:'