diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index 7d115138f6..317b0273ac 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -520,11 +520,18 @@ EndSection</programlisting>
         <para>Configuration with Intel i810 integrated chipsets
           requires the <devicename>agpgart</devicename>
           AGP programming interface for <application>XFree86</application>
-          to drive the card.  To use <devicename>agpgart</devicename>,
-          the <filename>agp.ko</filename> kernel loadable module needs to
-          be loaded into the kernel with &man.kldload.8;.  This can be
-          done automatically with the &man.loader.8; at boot time.
-          Simply add this line to
+          to drive the card.  The &man.agp.4; driver is in the
+	  <filename>GENERIC</filename> kernel since releases
+	  4.8-RELEASE and 5.0-RELEASE.  On prior releases, you will
+	  have to add the following line:</para>
+
+	<programlisting>device agp</programlisting>
+
+	<para>in your kernel configuration file and rebuild a new
+	  kernel.  Instead, you may want to load
+	  the <filename>agp.ko</filename> kernel module
+          automatically with the &man.loader.8; at boot time.
+          For that, simply add this line to
           <filename>/boot/loader.conf</filename>:</para>
 
         <programlisting>agp_load="YES"</programlisting>
@@ -545,7 +552,11 @@ EndSection</programlisting>
 	</note>
 
         <para>This will allow configuration of the hardware as any other
-          graphics board.</para>
+          graphics board.  Note on systems without the &man.agp.4;
+	  driver compiled in the kernel, trying to load the module
+	  with &man.kldload.8; will not work.  This driver has to be
+	  in the kernel at boot time through being compiled in or
+	  using <filename>/boot/loader.conf</filename>.</para>
 
 	<para>If you are using <application>XFree86 4.1.0</application> (or
 	  later) and messages about unresolved symbols like