diff --git a/include/i386/Makefile b/include/i386/Makefile
index 6870657b6bfa..40f272e3b8f9 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -4,6 +4,7 @@
 INCS=	\
 	asm.h \
 	asmacros.h \
+	atomic.h \
 	cpufunc.h \
 	profile.h
 INCSDIR=	${INCLUDEDIR}/i386
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index 159d807f777c..6f188b167b95 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -27,6 +27,11 @@
  *
  * $FreeBSD$
  */
+
+#ifdef __i386__
+#include <i386/atomic.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
 
@@ -592,3 +597,5 @@ atomic_swap_long(volatile u_long *p, u_long v)
 #endif /* !SAN_NEEDS_INTERCEPTORS || SAN_RUNTIME */
 
 #endif /* !_MACHINE_ATOMIC_H_ */
+
+#endif /* __i386__ */