diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index d8c727466a..983d2e6287 100644
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -19,6 +19,6 @@ libspl_la_SOURCES = \
 	${top_srcdir}/lib/libspl/strnlen.c \
 	${top_srcdir}/lib/libspl/u8_textprep.c \
 	${top_srcdir}/lib/libspl/zone.c \
-	${top_srcdir}/lib/libspl/asm/atomic.S \
+	${top_srcdir}/lib/libspl/asm-${target_cpu}/atomic.S \
 	${top_srcdir}/lib/libspl/include/sys/list.h \
 	${top_srcdir}/lib/libspl/include/sys/list_impl.h
diff --git a/lib/libspl/asm-i386/atomic.S b/lib/libspl/asm-i686/atomic.S
similarity index 100%
rename from lib/libspl/asm-i386/atomic.S
rename to lib/libspl/asm-i686/atomic.S
diff --git a/lib/libspl/asm-amd64/atomic.S b/lib/libspl/asm-x86_64/atomic.S
similarity index 100%
rename from lib/libspl/asm-amd64/atomic.S
rename to lib/libspl/asm-x86_64/atomic.S