diff --git a/libm65/gen_q65_wave.f90 b/libm65/gen_q65_wave.f90
index 297f7f1ef..e84ec2641 100644
--- a/libm65/gen_q65_wave.f90
+++ b/libm65/gen_q65_wave.f90
@@ -7,6 +7,7 @@ subroutine gen_q65_wave(msg,ichk,ntxfreq,mode65,itype,msgsent,iwave,nwave)
   character*22 msg
   character*22 msgsent          !Message as it will be received
   character*120 cmnd
+  character*80 wsjtx_dir
   character*16 cjunk
   real*8 t,dt,phi,f,f0,dfgen,dphi,twopi,tsym
   integer itone(85)
@@ -14,17 +15,25 @@ subroutine gen_q65_wave(msg,ichk,ntxfreq,mode65,itype,msgsent,iwave,nwave)
   integer sent(63)
   integer*2 iwave(NMAX)
   integer icos7(0:6)
+  logical first
   data icos7/2,5,6,0,4,1,3/     !Defines a 7x7 Costas array
-  data twopi/6.283185307179586476d0/
+  data twopi/6.283185307179586476d0/,first/.true./
   save
 
+  if(first) then
+     open(9,file='wsjtx_dir.txt',status='old')
+     read(9,*) wsjtx_dir
+     close(9)
+     first=.false.
+  endif
+
   msgsent=msg
 !                1         2         3         4         5
 !       12345678901234567890123456789012345678901234567890123456789012345
   cmnd='q65sim "K1ABC W9XYZ EN37      " A 1500 0 0 0 0 60 0 99 >itone.txt'
   cmnd(9:30)=msg
   write(cmnd(35:38),'(i4)') ntxfreq
-  cmnd='\WSJT-X\install\bin\\'//cmnd
+  cmnd=trim(wsjtx_dir)//cmnd
   call execute_command_line(cmnd)
   open(9,file='itone.txt',status='old')
   do i=1,99
diff --git a/libm65/q65b.f90 b/libm65/q65b.f90
index 1fad2e1d5..411c6797c 100644
--- a/libm65/q65b.f90
+++ b/libm65/q65b.f90
@@ -9,7 +9,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol,  &
   integer*2 iwave(60*12000)
   complex ca(MAXFFT1),cb(MAXFFT1)          !FFTs of raw x,y data
   complex cx(0:MAXFFT2-1),cy(0:MAXFFT2-1),cz(0:MAXFFT2-1)
-  logical xpol
+  logical xpol,first
   real*8 fcenter
   character*12 mycall0,hiscall0
   character*12 mycall,hiscall
@@ -20,7 +20,17 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol,  &
   character*80 line2
   character*40 msg40
   character*15 fname
+  character*80 wsjtx_dir
   common/cacb/ca,cb
+  data first/.true./
+  save
+
+  if(first) then
+     open(9,file='wsjtx_dir.txt',status='old')
+     read(9,*) wsjtx_dir
+     close(9)
+     first=.false.
+  endif
 
   mycall='K1JT'
   hiscall='IV3NWV'
@@ -65,14 +75,14 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol,  &
 
 !  write(77,*) nutc,ikhz,mousedf,ntol
 
-!                1         2         3         4         5         6         7         8         9        10        11        12
-!       1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901'
-  cmnd='\WSJT-X\install\bin\jt9 -3 -X 32 -f 1079 -F 1000 -c MyCall      -x HisCall     -g FN42 000000_0001.wav  > q65_decodes.txt'
-  write(cmnd(37:40),'(i4)') 1000
-  write(cmnd(45:48),'(i4)') ntol
-  write(cmnd(53:64),'(a12)') mycall
-  write(cmnd(68:79),'(a12)') hiscall
-  write(cmnd(83:86),'(a4)') grid4
+!                1         2         3         4         5         6         7         8         9        10
+!       12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901'
+  cmnd='jt9 -3 -X 32 -f 1079 -F 1000 -c MyCall      -x HisCall     -g FN42 000000_0001.wav  > q65_decodes.txt'
+  write(cmnd(17:20),'(i4)') 1000
+  write(cmnd(25:28),'(i4)') ntol
+  write(cmnd(33:44),'(a12)') mycall
+  write(cmnd(48:59),'(a12)') hiscall
+  write(cmnd(63:66),'(a4)') grid4
   fname='000000_0001.wav'
   npol=1
   if(xpol) npol=4
@@ -93,9 +103,9 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol,  &
      open(25,file=fname,access='stream',status='unknown')
      write(25) h,iwave
      close(25)
-     write(cmnd(98:98),'(i1)') ipol
-     if(ipol.eq.2) cmnd(104:104)='>'
-     call execute_command_line(trim(cmnd))
+     write(cmnd(78:78),'(i1)') ipol
+     if(ipol.eq.2) cmnd(84:84)='>'
+     call execute_command_line(trim(trim(wsjtx_dir)//cmnd))
   enddo
 
   open(24,file='q65_decodes.txt',status='unknown')