diff --git a/Makefile.in b/Makefile.in
index 7dd2d8c68..91f9450c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ all:    Audio.so plrs plrr
 
 OS=@OS@
 FC=@FC@
+FCV=@FCV@
 COMPILER += @FC_LIB_PATH@
 
 LDFLAGS	+= -L${COMPILER}
@@ -80,14 +81,14 @@ deep65.o: deep65.F
 	$(FC) -c -O0 -Wall -fno-second-underscore -fPIC deep65.F
 
 Audio.so: $(OBJS2C) $(OBJS3C) $(OBJS2F77) $(SRCS2F90) $(AUDIOSRCS)
-	 ${F2PY} -c --quiet --opt="-O ${CFLAGS} \
-	${FFLAGS}"	$(OBJS2C) $(OBJS2F77) -m Audio \
-	--f77exec=${FC} --f90exec=${FC} ${CPPFLAGS} ${LDFLAGS} ${LIBS} \
-	only: $(F2PYONLY) \
-	: $(SRCS2F90) \
+	${F2PY} -c --quiet --noopt --debug \
+	--f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
+	$(OBJS2C) $(OBJS2F77) -m Audio \
+	--fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
+	${CPPFLAGS} ${LDFLAGS} ${LIBS} \
+	only: $(F2PYONLY) : $(SRCS2F90) \
 	${SRCS3C} ${AUDIOSRCS}
 
-
 init_rs_int.o: init_rs.c
 	$(CC) $(CFLAGS) -c -DBIGSYM=1 -o init_rs_int.o init_rs.c
 encode_rs_int.o: encode_rs.c
diff --git a/map65.py b/map65.py
index a5c500ca1..646a7a18c 100644
--- a/map65.py
+++ b/map65.py
@@ -1,4 +1,4 @@
-#---------------------------------------------------------------------- MAP65
+#----------------------------------------------------------------------- MAP65
 # $Date$ $Revision$
 #
 from Tkinter import *