diff --git a/include/i386/Makefile b/include/i386/Makefile
index 9f6ab9b47766..9b31431549b7 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -7,6 +7,7 @@ INCS=	\
 	atomic.h \
 	cpufunc.h \
 	pmap.h \
+	proc.h \
 	profile.h \
 	segments.h
 INCSDIR=	${INCLUDEDIR}/i386
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 763f2a293e90..6181df35261e 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -32,6 +32,10 @@
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/proc.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_PROC_H_
 #define	_MACHINE_PROC_H_
 
@@ -117,3 +121,5 @@ extern int max_ldt_segment;
 #endif  /* _KERNEL */
 
 #endif /* !_MACHINE_PROC_H_ */
+
+#endif /* __i386__ */