diff --git a/include/i386/Makefile b/include/i386/Makefile
index e7eb0dd0c2eb..9f6ab9b47766 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -6,6 +6,7 @@ INCS=	\
 	asmacros.h \
 	atomic.h \
 	cpufunc.h \
+	pmap.h \
 	profile.h \
 	segments.h
 INCSDIR=	${INCLUDEDIR}/i386
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 318e70e7794c..9aacae73ebd4 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -44,6 +44,10 @@
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/pmap.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_PMAP_H_
 #define	_MACHINE_PMAP_H_
 
@@ -584,3 +588,5 @@ pmap_pml5e_index(vm_offset_t va)
 #endif /* !LOCORE */
 
 #endif /* !_MACHINE_PMAP_H_ */
+
+#endif /* __i386__ */