diff --git a/include/i386/Makefile b/include/i386/Makefile
index 60f70d4756b2..9bf2cef50b78 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -1,7 +1,8 @@
 # i386 headers installed on amd64
 
 .PATH: ${SRCTOP}/sys/i386/include
-INCS=
+INCS=	\
+	cpufunc.h
 INCSDIR=	${INCLUDEDIR}/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 941c951a941a..09f63b865948 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -38,6 +38,10 @@
  * used in preference to this.
  */
 
+#ifdef __i386__
+#include <i386/cpufunc.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_CPUFUNC_H_
 #define	_MACHINE_CPUFUNC_H_
 
@@ -966,3 +970,5 @@ int	wrmsr_safe(u_int msr, uint64_t newval);
 #endif
 
 #endif /* !_MACHINE_CPUFUNC_H_ */
+
+#endif /* __i386__ */