diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 9732d509..1dd27282 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -76,7 +76,11 @@ typedef struct drm_file drm_file_t;
 #if defined(__FreeBSD__)
 #include <sys/rman.h>
 #include <sys/memrange.h>
+#if __FreeBSD_version >= 800004
+#include <dev/agp/agpvar.h>
+#else /* __FreeBSD_version >= 800004 */
 #include <pci/agpvar.h>
+#endif /* __FreeBSD_version >= 800004 */
 #include <sys/agpio.h>
 #if __FreeBSD_version >= 500000
 #include <sys/mutex.h>
diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index 6f963b9c..4b921322 100644
--- a/bsd-core/drm_agpsupport.c
+++ b/bsd-core/drm_agpsupport.c
@@ -36,7 +36,11 @@
 #include "drmP.h"
 
 #ifdef __FreeBSD__
+#if __FreeBSD_version >= 800004
+#include <dev/agp/agpreg.h>
+#else /* __FreeBSD_version >= 800004 */
 #include <pci/agpreg.h>
+#endif /* __FreeBSD_version >= 800004 */
 #include <dev/pci/pcireg.h>
 #endif