diff --git a/build/exe.mk b/build/exe.mk
index 50a78032..f146d61b 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -46,7 +46,7 @@ $(PROGRAM) : $(OBJS)
 %.i : %.c
 	$(CC) $(CFLAGS) -E $< -o $@
 
-%.o : %.s
+%.o : %.nasm
 	$(NASM) -f elf -d ELF -i i386/ $< -o $@
 
 .PHONY : clean
diff --git a/build/lib.mk b/build/lib.mk
index 78efe3c3..dc9dec2a 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -48,7 +48,7 @@ $(DYNAMIC_LIB) : $(OBJS)
 %.i : %.c
 	$(CC) $(CFLAGS) -E $< -o $@
 
-%.o : %.s
+%.o : %.nasm
 	$(NASM) -f elf -d ELF -i i386/ $< -o $@
 
 .PHONY : clean
diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index d20c86bb..9cfbac5f 100644
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -45,23 +45,23 @@ C_FILES= \
 	stream_encoder_framing.c
 
 NASM_FILES= \
-	i386/cpu_asm.s \
-	i386/fixed_asm.s \
-	i386/lpc_asm.s
+	i386/cpu_asm.nasm \
+	i386/fixed_asm.nasm \
+	i386/lpc_asm.nasm
 
-OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.s=.obj)
+OBJS= $(C_FILES:.c=.obj) $(NASM_FILES:.nasm=.obj)
 
 all: libFLAC.lib
 
 libFLAC.lib: $(OBJS)
 	link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)
 
-i386/cpu_asm.obj: i386/cpu_asm.s
-	$(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.s -o i386/cpu_asm.obj
-i386/fixed_asm.obj: i386/fixed_asm.s
-	$(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.s -o i386/fixed_asm.obj
-i386/lpc_asm.obj: i386/lpc_asm.s
-	$(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.s -o i386/lpc_asm.obj
+i386/cpu_asm.obj: i386/cpu_asm.nasm
+	$(NASM) -f win32 -d WIN32 -i i386/ i386/cpu_asm.nasm -o i386/cpu_asm.obj
+i386/fixed_asm.obj: i386/fixed_asm.nasm
+	$(NASM) -f win32 -d WIN32 -i i386/ i386/fixed_asm.nasm -o i386/fixed_asm.obj
+i386/lpc_asm.obj: i386/lpc_asm.nasm
+	$(NASM) -f win32 -d WIN32 -i i386/ i386/lpc_asm.nasm -o i386/lpc_asm.obj
 
 clean:
 	-del *.obj i386\*.obj *.pch
diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am
index bdbb919a..0b08d2d9 100644
--- a/src/libFLAC/ia32/Makefile.am
+++ b/src/libFLAC/ia32/Makefile.am
@@ -17,12 +17,12 @@
 #  Boston, MA  02111-1307, USA.
 
 # nasm build rule:
-SUFFIXES = .s .lo
-.s.lo:
+SUFFIXES = .nasm .lo
+.nasm.lo:
 	$(NASM) -f elf -d ELF $< -o $@
 
 noinst_LTLIBRARIES = libFLAC-asm.la
 libFLAC_asm_la_SOURCES = \
-	cpu_asm.s \
-	fixed_asm.s \
-	lpc_asm.s
+	cpu_asm.nasm \
+	fixed_asm.nasm \
+	lpc_asm.nasm