diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index bbe16a5a284e..6a6288f3b09e 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -741,23 +741,13 @@
         <listitem>
 	  <para>ES1868, ES1869, ES1879 and ES1888 (&man.sbc.4; driver)</para>
 	</listitem>
-        <listitem>
-	  <para>Maestro-1, Maestro-2, and Maestro-2E</para>
-	</listitem>
-        <listitem>
-	  <para>Maestro-3/Allegro</para>
-	  <note>
-	    <para>The Maestro-3/Allegro cannot be compiled into the
-	    &os; kernel due to licensing restrictions.  To use this
-	    driver, add the following line to
-	    <filename>/boot/loader.conf</filename>:</para>
-
-            <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
-	  </note>
-	</listitem>
       </itemizedlist>
     </para>
 
+    &hwlist.snd.maestro;
+
+    &hwlist.snd.maestro3;
+
     <para arch="i386,amd64">ForteMedia fm801</para>
 
     &hwlist.snd.gusc;
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index bbe16a5a284e..6a6288f3b09e 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -741,23 +741,13 @@
         <listitem>
 	  <para>ES1868, ES1869, ES1879 and ES1888 (&man.sbc.4; driver)</para>
 	</listitem>
-        <listitem>
-	  <para>Maestro-1, Maestro-2, and Maestro-2E</para>
-	</listitem>
-        <listitem>
-	  <para>Maestro-3/Allegro</para>
-	  <note>
-	    <para>The Maestro-3/Allegro cannot be compiled into the
-	    &os; kernel due to licensing restrictions.  To use this
-	    driver, add the following line to
-	    <filename>/boot/loader.conf</filename>:</para>
-
-            <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
-	  </note>
-	</listitem>
       </itemizedlist>
     </para>
 
+    &hwlist.snd.maestro;
+
+    &hwlist.snd.maestro3;
+
     <para arch="i386,amd64">ForteMedia fm801</para>
 
     &hwlist.snd.gusc;
diff --git a/release/doc/share/misc/dev.archlist.txt b/release/doc/share/misc/dev.archlist.txt
index 491e018f3b38..b91a4ee9b4c7 100644
--- a/release/doc/share/misc/dev.archlist.txt
+++ b/release/doc/share/misc/dev.archlist.txt
@@ -107,6 +107,8 @@ snd_es137x	i386,amd64
 snd_ess	i386,amd64
 snd_gusc	i386,amd64
 snd_ich	i386,amd64
+snd_maestro	i386,alpha,amd64
+snd_maestro3	i386,alpha,amd64
 snd_solo	i386,amd64
 ste	i386,pc98,alpha,amd64
 stg	i386,pc98