diff --git a/include/i386/Makefile b/include/i386/Makefile
index 40f272e3b8f..e7eb0dd0c2e 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -6,7 +6,8 @@ INCS=	\
 	asmacros.h \
 	atomic.h \
 	cpufunc.h \
-	profile.h
+	profile.h \
+	segments.h
 INCSDIR=	${INCLUDEDIR}/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index a5fd89fbf6c..1a04774e986 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -36,6 +36,10 @@
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/segments.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_SEGMENTS_H_
 #define	_MACHINE_SEGMENTS_H_
 
@@ -105,3 +109,5 @@ void	update_gdt_fsbase(struct thread *td, uint32_t base);
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_SEGMENTS_H_ */
+
+#endif /* __i386__ */