diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 189984c1e..b078529d3 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -108,9 +108,10 @@ contains
     call q65_enc(dgen,codewords)         !Initialize the Q65 codec
 
     nused=1
+    iavg=0
     call timer('q65_dec0',0)
 ! Call top-level routine in q65 module: establish sync and try for a q3 decode.
-    call q65_dec0(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
+    call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
          emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
 !    idec=-1   !### TEMPORARY ###
     call timer('q65_dec0',1)
@@ -168,7 +169,10 @@ contains
     if(iand(ndepth,16).eq.16) then
 ! There was no single-transmission decode. Try for an average 'q3n' decode.
        call timer('list_avg',0)
-       call q65_q3a(xdt,f0,nfqso,nsps,snr2,dat4,idec,decoded)
+! Call top-level routine in q65 module: establish sync and try for a q3 decode.
+       iavg=1
+       call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
+            emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
        call timer('list_avg',1)
        if(idec.ge.0) then
           nused=navg
diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90
index ee8a71292..bfc8b2229 100644
--- a/lib/qra/q65/q65.f90
+++ b/lib/qra/q65/q65.f90
@@ -17,12 +17,13 @@ module q65
 
 contains
 
-subroutine q65_dec0(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
+subroutine q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
      emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
 
 ! Top-level routine in q65 module
 
-! Input:  iwave(0:nmax-1)        Raw data
+! Input:  iavg                   0 for single-period decode, 1 for average
+!         iwave(0:nmax-1)        Raw data
 !         ntrperiod              T/R sequence length (s)
 !         nfqso                  Target frequency (Hz)
 !         ntol                   Search range around nfqso (Hz)
@@ -104,10 +105,14 @@ subroutine q65_dec0(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
   if(nsps.ge.7200) j0=1.0/dtstep              !Nominal start-signal index
 
   s3=0.
-  call timer('q65_syms',0)
+  if(iavg.eq.0) then
+     call timer('q65_syms',0)
 ! Compute symbol spectra with NSTEP time bins per symbol
-  call q65_symspec(iwave,ntrperiod*12000,iz,jz,s1)
-  call timer('q65_syms',1)
+     call q65_symspec(iwave,ntrperiod*12000,iz,jz,s1)
+     call timer('q65_syms',1)
+  else
+     s1=s1a
+  endif
 
   i0=nint(nfqso/df)                             !Target QSO frequency
   if(i0-64.lt.1 .or. i0-65+LL.gt.iz) go to 900  !Frequency out of range
@@ -282,27 +287,6 @@ subroutine q65_dec_q3(s1,iz,jz,s3,LL,ipk,jpk,snr2,dat4,idec,decoded)
   return
 end subroutine q65_dec_q3
 
-subroutine q65_q3a(xdt,f0,nfqso,nsps,snr2,dat4,idec,decoded)
-
-  integer dat4(13)
-  character*37 decoded
-  real, allocatable :: s3a(:,:)         !Symbol energies for avg s3a(LL,63)
-
-  df=12000.0/nsps
-  dtstep=float(nsps)/(NSTEP*12000.0)
-  iz=5000.0/df                     !Uppermost frequency bin, at 5000 Hz
-  txt=85.0*nsps/12000.0
-  istep=nsps/NSTEP
-  jz=(txt+1.0)*12000.0/istep       !Number of symbol/NSTEP bins
-  LL=64*(2+mode_q65)
-  allocate(s3a(-64:LL-65,63))
-  ipk=nint((f0-nfqso)/df) + mode_q65
-  jpk=nint(xdt/dtstep)
-  call q65_dec_q3(s1a,iz,jz,s3a,LL,ipk,jpk,snr2,dat4,idec,decoded)
-
-  return
-end subroutine q65_q3a
-
 subroutine q65_ccf_85(s1,iz,jz,nfqso,ia,ia2,  &
      ipk,jpk,f0,xdt,imsg_best,ccf,ccf1)