diff --git a/Makefile b/Makefile
index dd22cf8..1b89f47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE	= asm
 VERSION	= 0.2.1
-SUBDIRS	= data doc include src test
+SUBDIRS	= data doc include src tests
 RM	?= rm -f
 LN	?= ln -f
 TAR	?= tar -czvf
@@ -72,6 +72,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/arch/sparc64.c \
 		$(PACKAGE)-$(VERSION)/src/arch/yasep.c \
 		$(PACKAGE)-$(VERSION)/src/arch/yasep16.c \
+		$(PACKAGE)-$(VERSION)/src/arch/yasep32.c \
 		$(PACKAGE)-$(VERSION)/src/arch/Makefile \
 		$(PACKAGE)-$(VERSION)/src/arch/amd64.ins \
 		$(PACKAGE)-$(VERSION)/src/arch/amd64.reg \
@@ -105,26 +106,27 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/format/pe.c \
 		$(PACKAGE)-$(VERSION)/src/format/Makefile \
 		$(PACKAGE)-$(VERSION)/src/format/project.conf \
-		$(PACKAGE)-$(VERSION)/test/amd64.S \
-		$(PACKAGE)-$(VERSION)/test/arm.S \
-		$(PACKAGE)-$(VERSION)/test/armeb.S \
-		$(PACKAGE)-$(VERSION)/test/armel.S \
-		$(PACKAGE)-$(VERSION)/test/dalvik.S \
-		$(PACKAGE)-$(VERSION)/test/i386.S \
-		$(PACKAGE)-$(VERSION)/test/i386_real.S \
-		$(PACKAGE)-$(VERSION)/test/i486.S \
-		$(PACKAGE)-$(VERSION)/test/i586.S \
-		$(PACKAGE)-$(VERSION)/test/i686.S \
-		$(PACKAGE)-$(VERSION)/test/mips.S \
-		$(PACKAGE)-$(VERSION)/test/mipseb.S \
-		$(PACKAGE)-$(VERSION)/test/mipsel.S \
-		$(PACKAGE)-$(VERSION)/test/java.S \
-		$(PACKAGE)-$(VERSION)/test/sparc.S \
-		$(PACKAGE)-$(VERSION)/test/sparc64.S \
-		$(PACKAGE)-$(VERSION)/test/yasep.S \
-		$(PACKAGE)-$(VERSION)/test/yasep16.S \
-		$(PACKAGE)-$(VERSION)/test/Makefile \
-		$(PACKAGE)-$(VERSION)/test/project.conf \
+		$(PACKAGE)-$(VERSION)/tests/amd64.asm \
+		$(PACKAGE)-$(VERSION)/tests/arm.asm \
+		$(PACKAGE)-$(VERSION)/tests/armeb.asm \
+		$(PACKAGE)-$(VERSION)/tests/armel.asm \
+		$(PACKAGE)-$(VERSION)/tests/dalvik.asm \
+		$(PACKAGE)-$(VERSION)/tests/i386.asm \
+		$(PACKAGE)-$(VERSION)/tests/i386_real.asm \
+		$(PACKAGE)-$(VERSION)/tests/i486.asm \
+		$(PACKAGE)-$(VERSION)/tests/i586.asm \
+		$(PACKAGE)-$(VERSION)/tests/i686.asm \
+		$(PACKAGE)-$(VERSION)/tests/mips.asm \
+		$(PACKAGE)-$(VERSION)/tests/mipseb.asm \
+		$(PACKAGE)-$(VERSION)/tests/mipsel.asm \
+		$(PACKAGE)-$(VERSION)/tests/java.asm \
+		$(PACKAGE)-$(VERSION)/tests/sparc.asm \
+		$(PACKAGE)-$(VERSION)/tests/sparc64.asm \
+		$(PACKAGE)-$(VERSION)/tests/yasep.asm \
+		$(PACKAGE)-$(VERSION)/tests/yasep16.asm \
+		$(PACKAGE)-$(VERSION)/tests/yasep32.asm \
+		$(PACKAGE)-$(VERSION)/tests/Makefile \
+		$(PACKAGE)-$(VERSION)/tests/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/COPYING \
 		$(PACKAGE)-$(VERSION)/config.h \
diff --git a/project.conf b/project.conf
index 436c2b5..9857b55 100644
--- a/project.conf
+++ b/project.conf
@@ -2,5 +2,5 @@ package=asm
 version=0.2.1
 config=h,sh
 
-subdirs=data,doc,include,src,test
+subdirs=data,doc,include,src,tests
 dist=Makefile,COPYING,config.h,config.sh
diff --git a/src/Makefile b/src/Makefile
index 94d4a90..538fab9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ CPPFLAGSF= -I ../include
 CPPFLAGS=
 CFLAGSF	= -W `pkg-config --cflags cpp`
 CFLAGS	= -Wall -g -O2 -pedantic
-LDFLAGSF= -ldl
+LDFLAGSF= 
 AR	?= ar
 RANLIB	?= ranlib
 CCSHARED?= $(CC) -shared
diff --git a/src/arch/Makefile b/src/arch/Makefile
index e660014..7675d5f 100644
--- a/src/arch/Makefile
+++ b/src/arch/Makefile
@@ -1,4 +1,4 @@
-TARGETS	= amd64.so arm.so armeb.so armel.so dalvik.so i386.so i386_real.so i486.so i586.so i686.so java.so mips.so mipseb.so mipsel.so sparc.so sparc64.so yasep.so yasep16.so
+TARGETS	= amd64.so arm.so armeb.so armel.so dalvik.so i386.so i386_real.so i486.so i586.so i686.so java.so mips.so mipseb.so mipsel.so sparc.so sparc64.so yasep.so yasep16.so yasep32.so
 PREFIX	= /usr/local
 DESTDIR	=
 LIBDIR	= $(PREFIX)/lib
@@ -144,6 +144,13 @@ yasep16_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 yasep16.so: $(yasep16_OBJS)
 	$(CCSHARED) -o yasep16.so $(yasep16_OBJS) $(yasep16_LDFLAGS)
 
+yasep32_OBJS = yasep32.o
+yasep32_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
+yasep32_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+
+yasep32.so: $(yasep32_OBJS)
+	$(CCSHARED) -o yasep32.so $(yasep32_OBJS) $(yasep32_LDFLAGS)
+
 amd64.o: amd64.c amd64.ins amd64.reg common.ins null.ins i386.h i386.ins i386.reg i486.ins i686.ins i686.reg
 	$(CC) $(amd64_CFLAGS) -c amd64.c
 
@@ -198,8 +205,11 @@ yasep.o: yasep.c common.ins null.ins yasep.ins yasep.reg
 yasep16.o: yasep16.c common.ins null.ins yasep.ins yasep.reg
 	$(CC) $(yasep16_CFLAGS) -c yasep16.c
 
+yasep32.o: yasep32.c common.ins null.ins yasep.ins yasep.reg
+	$(CC) $(yasep32_CFLAGS) -c yasep32.c
+
 clean:
-	$(RM) -- $(amd64_OBJS) $(arm_OBJS) $(armeb_OBJS) $(armel_OBJS) $(dalvik_OBJS) $(i386_OBJS) $(i386_real_OBJS) $(i486_OBJS) $(i586_OBJS) $(i686_OBJS) $(java_OBJS) $(mips_OBJS) $(mipseb_OBJS) $(mipsel_OBJS) $(sparc_OBJS) $(sparc64_OBJS) $(yasep_OBJS) $(yasep16_OBJS)
+	$(RM) -- $(amd64_OBJS) $(arm_OBJS) $(armeb_OBJS) $(armel_OBJS) $(dalvik_OBJS) $(i386_OBJS) $(i386_real_OBJS) $(i486_OBJS) $(i586_OBJS) $(i686_OBJS) $(java_OBJS) $(mips_OBJS) $(mipseb_OBJS) $(mipsel_OBJS) $(sparc_OBJS) $(sparc64_OBJS) $(yasep_OBJS) $(yasep16_OBJS) $(yasep32_OBJS)
 
 distclean: clean
 	$(RM) -- $(TARGETS)
@@ -241,6 +251,8 @@ install: $(TARGETS)
 	$(INSTALL) -m 0644 -- yasep.so $(DESTDIR)$(LIBDIR)/asm/arch/yasep.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/asm/arch
 	$(INSTALL) -m 0644 -- yasep16.so $(DESTDIR)$(LIBDIR)/asm/arch/yasep16.so
+	$(MKDIR) $(DESTDIR)$(LIBDIR)/asm/arch
+	$(INSTALL) -m 0644 -- yasep32.so $(DESTDIR)$(LIBDIR)/asm/arch/yasep32.so
 
 uninstall:
 	$(RM) -- $(DESTDIR)$(LIBDIR)/asm/arch/amd64.so
@@ -261,5 +273,6 @@ uninstall:
 	$(RM) -- $(DESTDIR)$(LIBDIR)/asm/arch/sparc64.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/asm/arch/yasep.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/asm/arch/yasep16.so
+	$(RM) -- $(DESTDIR)$(LIBDIR)/asm/arch/yasep32.so
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/arch/project.conf b/src/arch/project.conf
index c02b7b1..e74e670 100644
--- a/src/arch/project.conf
+++ b/src/arch/project.conf
@@ -1,4 +1,4 @@
-targets=amd64,arm,armeb,armel,dalvik,i386,i386_real,i486,i586,i686,java,mips,mipseb,mipsel,sparc,sparc64,yasep,yasep16
+targets=amd64,arm,armeb,armel,dalvik,i386,i386_real,i486,i586,i686,java,mips,mipseb,mipsel,sparc,sparc64,yasep,yasep16,yasep32
 cppflags_force=-I ../../include
 cflags_force=-W `pkg-config --cflags libSystem`
 cflags=-Wall -g -O2 -fPIC -pedantic
@@ -147,3 +147,11 @@ install=$(LIBDIR)/asm/arch
 
 [yasep16.c]
 depends=common.ins,null.ins,yasep.ins,yasep.reg
+
+[yasep32]
+type=plugin
+sources=yasep32.c
+install=$(LIBDIR)/asm/arch
+
+[yasep32.c]
+depends=common.ins,null.ins,yasep.ins,yasep.reg
diff --git a/test/armeb.S b/test/armeb.S
deleted file mode 100644
index 962f447..0000000
--- a/test/armeb.S
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $Id$ */
-#include "arm.S"
diff --git a/test/armel.S b/test/armel.S
deleted file mode 100644
index 962f447..0000000
--- a/test/armel.S
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $Id$ */
-#include "arm.S"
diff --git a/test/mipseb.S b/test/mipseb.S
deleted file mode 100644
index 6b1b7ff..0000000
--- a/test/mipseb.S
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $Id$ */
-#include "mips.S"
diff --git a/test/mipsel.S b/test/mipsel.S
deleted file mode 100644
index 6b1b7ff..0000000
--- a/test/mipsel.S
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $Id$ */
-#include "mips.S"
diff --git a/test/yasep16.S b/test/yasep16.S
deleted file mode 100644
index 985453f..0000000
--- a/test/yasep16.S
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $Id$ */
-#include "yasep.S"
diff --git a/test/Makefile b/tests/Makefile
similarity index 56%
rename from test/Makefile
rename to tests/Makefile
index f48b778..c30274f 100644
--- a/test/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-TARGETS	= amd64.o arm.o armeb.o armel.o dalvik.o i386.o i386_real.o i486.o i586.o i686.o mips.o mipseb.o mipsel.o java.o sparc.o sparc64.o yasep.o yasep16.o
+TARGETS	= amd64.o arm.o armeb.o armel.o dalvik.o i386.o i386_real.o i486.o i586.o i686.o mips.o mipseb.o mipsel.o java.o sparc.o sparc64.o yasep.o yasep16.o yasep32.o
 PREFIX	= /usr/local
 DESTDIR	=
 BINDIR	= $(PREFIX)/bin
@@ -66,62 +66,68 @@ yasep.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a yasep -f flat
 yasep16.o_OBJS = yasep16.o
 yasep16.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a yasep16 -f flat
 
-amd64.o: amd64.S ../src/asm
-	$(AS) $(amd64.o_ASFLAGS) -o amd64.o amd64.S
+yasep32.o_OBJS = yasep32.o
+yasep32.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a yasep32 -f flat
 
-arm.o: arm.S ../src/asm
-	$(AS) $(arm.o_ASFLAGS) -o arm.o arm.S
+amd64.o: amd64.asm ../src/asm
+	$(AS) $(amd64.o_ASFLAGS) -o amd64.o amd64.asm
 
-armeb.o: armeb.S arm.S ../src/asm
-	$(AS) $(armeb.o_ASFLAGS) -o armeb.o armeb.S
+arm.o: arm.asm ../src/asm
+	$(AS) $(arm.o_ASFLAGS) -o arm.o arm.asm
 
-armel.o: armel.S arm.S ../src/asm
-	$(AS) $(armel.o_ASFLAGS) -o armel.o armel.S
+armeb.o: armeb.asm arm.asm ../src/asm
+	$(AS) $(armeb.o_ASFLAGS) -o armeb.o armeb.asm
 
-dalvik.o: dalvik.S ../src/asm
-	$(AS) $(dalvik.o_ASFLAGS) -o dalvik.o dalvik.S
+armel.o: armel.asm arm.asm ../src/asm
+	$(AS) $(armel.o_ASFLAGS) -o armel.o armel.asm
 
-i386.o: i386.S ../src/asm
-	$(AS) $(i386.o_ASFLAGS) -o i386.o i386.S
+dalvik.o: dalvik.asm ../src/asm
+	$(AS) $(dalvik.o_ASFLAGS) -o dalvik.o dalvik.asm
 
-i386_real.o: i386_real.S ../src/asm
-	$(AS) $(i386_real.o_ASFLAGS) -o i386_real.o i386_real.S
+i386.o: i386.asm ../src/asm
+	$(AS) $(i386.o_ASFLAGS) -o i386.o i386.asm
 
-i486.o: i486.S ../src/asm
-	$(AS) $(i486.o_ASFLAGS) -o i486.o i486.S
+i386_real.o: i386_real.asm ../src/asm
+	$(AS) $(i386_real.o_ASFLAGS) -o i386_real.o i386_real.asm
 
-i586.o: i586.S ../src/asm
-	$(AS) $(i586.o_ASFLAGS) -o i586.o i586.S
+i486.o: i486.asm ../src/asm
+	$(AS) $(i486.o_ASFLAGS) -o i486.o i486.asm
 
-i686.o: i686.S ../src/asm
-	$(AS) $(i686.o_ASFLAGS) -o i686.o i686.S
+i586.o: i586.asm ../src/asm
+	$(AS) $(i586.o_ASFLAGS) -o i586.o i586.asm
 
-mips.o: mips.S ../src/asm
-	$(AS) $(mips.o_ASFLAGS) -o mips.o mips.S
+i686.o: i686.asm ../src/asm
+	$(AS) $(i686.o_ASFLAGS) -o i686.o i686.asm
 
-mipseb.o: mipseb.S mips.S ../src/asm
-	$(AS) $(mipseb.o_ASFLAGS) -o mipseb.o mipseb.S
+mips.o: mips.asm ../src/asm
+	$(AS) $(mips.o_ASFLAGS) -o mips.o mips.asm
 
-mipsel.o: mipsel.S mips.S ../src/asm
-	$(AS) $(mipsel.o_ASFLAGS) -o mipsel.o mipsel.S
+mipseb.o: mipseb.asm mips.asm ../src/asm
+	$(AS) $(mipseb.o_ASFLAGS) -o mipseb.o mipseb.asm
 
-java.o: java.S ../src/asm
-	$(AS) $(java.o_ASFLAGS) -o java.o java.S
+mipsel.o: mipsel.asm mips.asm ../src/asm
+	$(AS) $(mipsel.o_ASFLAGS) -o mipsel.o mipsel.asm
 
-sparc.o: sparc.S ../src/asm
-	$(AS) $(sparc.o_ASFLAGS) -o sparc.o sparc.S
+java.o: java.asm ../src/asm
+	$(AS) $(java.o_ASFLAGS) -o java.o java.asm
 
-sparc64.o: sparc64.S ../src/asm
-	$(AS) $(sparc64.o_ASFLAGS) -o sparc64.o sparc64.S
+sparc.o: sparc.asm ../src/asm
+	$(AS) $(sparc.o_ASFLAGS) -o sparc.o sparc.asm
 
-yasep.o: yasep.S ../src/asm
-	$(AS) $(yasep.o_ASFLAGS) -o yasep.o yasep.S
+sparc64.o: sparc64.asm ../src/asm
+	$(AS) $(sparc64.o_ASFLAGS) -o sparc64.o sparc64.asm
 
-yasep16.o: yasep16.S ../src/asm yasep.S
-	$(AS) $(yasep16.o_ASFLAGS) -o yasep16.o yasep16.S
+yasep.o: yasep.asm ../src/asm
+	$(AS) $(yasep.o_ASFLAGS) -o yasep.o yasep.asm
+
+yasep16.o: yasep16.asm ../src/asm yasep.asm
+	$(AS) $(yasep16.o_ASFLAGS) -o yasep16.o yasep16.asm
+
+yasep32.o: yasep32.asm ../src/asm yasep.asm
+	$(AS) $(yasep32.o_ASFLAGS) -o yasep32.o yasep32.asm
 
 clean:
-	$(RM) -- $(amd64.o_OBJS) $(arm.o_OBJS) $(armeb.o_OBJS) $(armel.o_OBJS) $(dalvik.o_OBJS) $(i386.o_OBJS) $(i386_real.o_OBJS) $(i486.o_OBJS) $(i586.o_OBJS) $(i686.o_OBJS) $(mips.o_OBJS) $(mipseb.o_OBJS) $(mipsel.o_OBJS) $(java.o_OBJS) $(sparc.o_OBJS) $(sparc64.o_OBJS) $(yasep.o_OBJS) $(yasep16.o_OBJS)
+	$(RM) -- $(amd64.o_OBJS) $(arm.o_OBJS) $(armeb.o_OBJS) $(armel.o_OBJS) $(dalvik.o_OBJS) $(i386.o_OBJS) $(i386_real.o_OBJS) $(i486.o_OBJS) $(i586.o_OBJS) $(i686.o_OBJS) $(mips.o_OBJS) $(mipseb.o_OBJS) $(mipsel.o_OBJS) $(java.o_OBJS) $(sparc.o_OBJS) $(sparc64.o_OBJS) $(yasep.o_OBJS) $(yasep16.o_OBJS) $(yasep32.o_OBJS)
 
 distclean: clean
 	$(RM) -- $(TARGETS)
diff --git a/test/amd64.S b/tests/amd64.asm
similarity index 100%
rename from test/amd64.S
rename to tests/amd64.asm
diff --git a/test/arm.S b/tests/arm.asm
similarity index 100%
rename from test/arm.S
rename to tests/arm.asm
diff --git a/tests/armeb.asm b/tests/armeb.asm
new file mode 100644
index 0000000..d60da89
--- /dev/null
+++ b/tests/armeb.asm
@@ -0,0 +1,2 @@
+/* $Id$ */
+#include "arm.asm"
diff --git a/tests/armel.asm b/tests/armel.asm
new file mode 100644
index 0000000..d60da89
--- /dev/null
+++ b/tests/armel.asm
@@ -0,0 +1,2 @@
+/* $Id$ */
+#include "arm.asm"
diff --git a/test/dalvik.S b/tests/dalvik.asm
similarity index 100%
rename from test/dalvik.S
rename to tests/dalvik.asm
diff --git a/test/i386.S b/tests/i386.asm
similarity index 100%
rename from test/i386.S
rename to tests/i386.asm
diff --git a/test/i386_real.S b/tests/i386_real.asm
similarity index 100%
rename from test/i386_real.S
rename to tests/i386_real.asm
diff --git a/test/i486.S b/tests/i486.asm
similarity index 100%
rename from test/i486.S
rename to tests/i486.asm
diff --git a/test/i586.S b/tests/i586.asm
similarity index 100%
rename from test/i586.S
rename to tests/i586.asm
diff --git a/test/i686.S b/tests/i686.asm
similarity index 100%
rename from test/i686.S
rename to tests/i686.asm
diff --git a/test/java.S b/tests/java.asm
similarity index 100%
rename from test/java.S
rename to tests/java.asm
diff --git a/test/mips.S b/tests/mips.asm
similarity index 100%
rename from test/mips.S
rename to tests/mips.asm
diff --git a/tests/mipseb.asm b/tests/mipseb.asm
new file mode 100644
index 0000000..b68061b
--- /dev/null
+++ b/tests/mipseb.asm
@@ -0,0 +1,2 @@
+/* $Id$ */
+#include "mips.asm"
diff --git a/tests/mipsel.asm b/tests/mipsel.asm
new file mode 100644
index 0000000..b68061b
--- /dev/null
+++ b/tests/mipsel.asm
@@ -0,0 +1,2 @@
+/* $Id$ */
+#include "mips.asm"
diff --git a/test/project.conf b/tests/project.conf
similarity index 58%
rename from test/project.conf
rename to tests/project.conf
index a099ea2..b62bf48 100644
--- a/test/project.conf
+++ b/tests/project.conf
@@ -1,147 +1,155 @@
-targets=amd64.o,arm.o,armeb.o,armel.o,dalvik.o,i386.o,i386_real.o,i486.o,i586.o,i686.o,mips.o,mipseb.o,mipsel.o,java.o,sparc.o,sparc64.o,yasep.o,yasep16.o
+targets=amd64.o,arm.o,armeb.o,armel.o,dalvik.o,i386.o,i386_real.o,i486.o,i586.o,i686.o,mips.o,mipseb.o,mipsel.o,java.o,sparc.o,sparc64.o,yasep.o,yasep16.o,yasep32.o
 as=../src/asm-static
 dist=Makefile
 
 [amd64.o]
 type=object
-sources=amd64.S
+sources=amd64.asm
 
-[amd64.S]
+[amd64.asm]
 asflags=-a amd64
 depends=../src/asm
 
 [arm.o]
 type=object
-sources=arm.S
+sources=arm.asm
 
-[arm.S]
+[arm.asm]
 asflags=-a arm
 depends=../src/asm
 
 [armeb.o]
 type=object
-sources=armeb.S
+sources=armeb.asm
 
-[armeb.S]
+[armeb.asm]
 asflags=-a armeb
-depends=arm.S,../src/asm
+depends=arm.asm,../src/asm
 
 [armel.o]
 type=object
-sources=armel.S
+sources=armel.asm
 
-[armel.S]
+[armel.asm]
 asflags=-a armel
-depends=arm.S,../src/asm
+depends=arm.asm,../src/asm
 
 [dalvik.o]
 type=object
-sources=dalvik.S
+sources=dalvik.asm
 
-[dalvik.S]
+[dalvik.asm]
 asflags=-a dalvik -f flat
 depends=../src/asm
 
 [i386.o]
 type=object
-sources=i386.S
+sources=i386.asm
 
-[i386.S]
+[i386.asm]
 asflags=-a i386
 depends=../src/asm
 
 [i386_real.o]
 type=object
-sources=i386_real.S
+sources=i386_real.asm
 
-[i386_real.S]
+[i386_real.asm]
 asflags=-a i386_real -f flat
 depends=../src/asm
 
 [i486.o]
 type=object
-sources=i486.S
+sources=i486.asm
 
-[i486.S]
+[i486.asm]
 asflags=-a i486
 depends=../src/asm
 
 [i586.o]
 type=object
-sources=i586.S
+sources=i586.asm
 
-[i586.S]
+[i586.asm]
 asflags=-a i586
 depends=../src/asm
 
 [i686.o]
 type=object
-sources=i686.S
+sources=i686.asm
 
-[i686.S]
+[i686.asm]
 asflags=-a i686
 depends=../src/asm
 
 [java.o]
 type=object
-sources=java.S
+sources=java.asm
 
-[java.S]
+[java.asm]
 asflags=-a java -f flat
 depends=../src/asm
 
 [mips.o]
 type=object
-sources=mips.S
+sources=mips.asm
 
-[mips.S]
+[mips.asm]
 asflags=-a mips
 depends=../src/asm
 
 [mipseb.o]
 type=object
-sources=mipseb.S
+sources=mipseb.asm
 
-[mipseb.S]
+[mipseb.asm]
 asflags=-a mipseb
-depends=mips.S,../src/asm
+depends=mips.asm,../src/asm
 
 [mipsel.o]
 type=object
-sources=mipsel.S
+sources=mipsel.asm
 
-[mipsel.S]
+[mipsel.asm]
 asflags=-a mipsel
-depends=mips.S,../src/asm
+depends=mips.asm,../src/asm
 
 [sparc.o]
 type=object
-sources=sparc.S
+sources=sparc.asm
 
-[sparc.S]
+[sparc.asm]
 asflags=-a sparc
 depends=../src/asm
 
 [sparc64.o]
 type=object
-sources=sparc64.S
+sources=sparc64.asm
 
-[sparc64.S]
+[sparc64.asm]
 asflags=-a sparc64
 depends=../src/asm
 
 [yasep.o]
 type=object
-sources=yasep.S
+sources=yasep.asm
 
-[yasep.S]
+[yasep.asm]
 asflags=-a yasep -f flat
 depends=../src/asm
 
 [yasep16.o]
 type=object
-sources=yasep16.S
+sources=yasep16.asm
 
-[yasep16.S]
+[yasep16.asm]
 asflags=-a yasep16 -f flat
-depends=../src/asm,yasep.S
+depends=../src/asm,yasep.asm
+
+[yasep32.o]
+type=object
+sources=yasep32.asm
+
+[yasep32.asm]
+asflags=-a yasep32 -f flat
+depends=../src/asm,yasep.asm
diff --git a/test/sparc.S b/tests/sparc.asm
similarity index 100%
rename from test/sparc.S
rename to tests/sparc.asm
diff --git a/test/sparc64.S b/tests/sparc64.asm
similarity index 100%
rename from test/sparc64.S
rename to tests/sparc64.asm
diff --git a/test/yasep.S b/tests/yasep.asm
similarity index 100%
rename from test/yasep.S
rename to tests/yasep.asm
diff --git a/tests/yasep16.asm b/tests/yasep16.asm
new file mode 100644
index 0000000..85f85ac
--- /dev/null
+++ b/tests/yasep16.asm
@@ -0,0 +1,2 @@
+/* $Id$ */
+#include "yasep.asm"
diff --git a/tests/yasep32.asm b/tests/yasep32.asm
new file mode 100644
index 0000000..85f85ac
--- /dev/null
+++ b/tests/yasep32.asm
@@ -0,0 +1,2 @@
+/* $Id$ */
+#include "yasep.asm"