diff --git a/Makefile.in b/Makefile.in
index 1bc5d467e..62ae59fe7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,3 @@
-#
 CC ?= @CC@
 FC ?= @F77@
 FFLAGS = @FFLAGS@
@@ -22,28 +21,44 @@ OBJS1 = JT65code.o nchar.o grid2deg.o packmsg.o packtext.o \
 	igray.o init_rs_int.o encode_rs_int.o decode_rs_int.o \
 	wrapkarn.o
 
-OBJS0= 	init_rs.o encode_rs.o decode_rs.o
-SRCS0= 	init_rs.c encode_rs.c decode_rs.c
+# For Windows
+#OBJS2C   = init_rs.o encode_rs.o decode_rs.o 
+OBJS2C   = init_rs.o encode_rs.o decode_rs.o 
+F2PYONLY = ftn_init ftn_quit audio_init spec getfile azdist0 astro0
+SRCS2F90 = a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 \
+	blanker.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 \
+	ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 \
+	i1tor4.f90 pix2d.f90 pix2d65.f90 rfile.f90 savedata.f90 spec.f90 \
+	wsjtgen.f90 runqqq.f90 fivehz.f90
+SRCS2F77	= wsjt1.f fsubs1.f fsubs.f astro.f astropak.f
+# For Windows
+#SRCS2C	= jtadudio.c resample.c ptt.c igray.c wrapkarn.c
+# For unix
+SRCS2C	= jtaudio.c ptt_unix.c igray.c wrapkarn.c start_threads.c cutil.c
 
-JT65SRCS = JT65code_all.f igray.o wrapkarn.o init_rs.o encode_rs.o decode_rs.o
+all:	wsjt6
+JT65code: $(OBJS1)
+	$(FC) -o JT65code $(OBJS1)
 
-all:	JT65code
+wsjt6:	Audio.so #wsjt.spec
+#	${PYTHON} c:\python23\installer\Build.py wsjt.spec
+#	${RM} wsjt6
 
-JT65code_demo: $(OBJS1)
-	$(FC) -o JT65code_demo $(OBJS1)
+Audio.so: $(OBJS2C)
+	 ${PYTHON} ${F2PY_PY} -c --verbose --opt="-O -cpp -D${OS} \
+	-fno-second-underscore"	$(OBJS2C) -m Audio \
+	--f77exec=${G95} --f90exec=${G95} -L${COMPILER} -lpthread -lg2c \
+	only: $(F2PYONLY) \
+	: $(SRCS2F90) \
+	$(SRCS2F77) \
+	${SRCS2C} 
 
-# $(OBJS0) regenerated by Audio.so target for now
-JT65code: Audio.so wrapkarn.o igray.o $(JT65SRCS) # $(OBJS0)
-	$(FC) -o JT65code $(JT65SRCS)
+wsjt.spec: wsjt.py astro.py g.py options.py palettes.py smeter.py specjt.py
+#	${PYTHON} c:\python23\installer\makespec.py --icon wsjt.ico \
+#	--tk --onefile wsjt.py
 
-wrapkarn.o: wrapkarn.c
-	$(CC) -c wrapkarn.c
-
-igray.o: igray.c
-	$(CC) -c igray.c
-
-$(OBJS0):	$(SRCS0)
-	$(CC) -c -DBIGSYM=1 $(SRCS0)
+#jtaudio.o: jtaudio.c
+#	cl -c jtaudio.c
 
 init_rs_int.o: init_rs.c
 	$(CC) -c -DBIGSYM=1 -o init_rs_int.o init_rs.c
@@ -54,19 +69,25 @@ encode_rs_int.o: encode_rs.c
 decode_rs_int.o: decode_rs.c
 	$(CC) -c -DBIGSYM=1 -o decode_rs_int.o decode_rs.c
 
-Audio.so: $(OBJS0)
-	 ${PYTHON} ${F2PY_PY} -c --quiet --opt="-O -cpp -D${OS} \
-	-fno-second-underscore" init_rs.o encode_rs.o decode_rs.o -m Audio \
-	--f77exec=${G95} --f90exec=${G95} -L${COMPILER} -lpthread -lg2c \
-	only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 \
-	: a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 \
-	blanker.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 \
-	ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 \
-	i1tor4.f90 pix2d.f90 pix2d65.f90 rfile.f90 savedata.f90 spec.f90 \
-	wsjtgen.f90 runqqq.f90 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f \
-	jtaudio.c ptt_unix.c igray.c wrapkarn.c start_threads.c cutil.c \
-	fivehz.f90	
+init_rs.o: init_rs.c
+	$(CC) -c -DBIGSYM=1 init_rs.c
+
+encode_rs.o: encode_rs.c
+	$(CC) -c -DBIGSYM=1 encode_rs.c
+
+decode_rs.o: decode_rs.c
+	$(CC) -c -DBIGSYM=1 decode_rs.c
+
+wrapkarn.o: wrapkarn.c
+	$(CC) -c wrapkarn.c
+
+igray.o: igray.c
+	$(CC) -c igray.c
+
+start_threads.o: start_threads.c
+	$(CC) -c start_threads.c
+
 .PHONY : clean
 clean:
-	${RM} -f *.o *.so JT65code JT65code_demo
+	${RM} -f *.o *.so JT65code