diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 825117f296ce..b4c4878fcb43 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata_wdc.c,v 1.35 2002/01/14 02:17:59 christos Exp $	*/
+/*	$NetBSD: ata_wdc.c,v 1.36 2002/04/23 20:41:13 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -69,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.35 2002/01/14 02:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.36 2002/04/23 20:41:13 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 23ef99b96884..9b19560ccf28 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: atavar.h,v 1.24 2002/04/09 21:17:54 bouyer Exp $	*/
+/*	$NetBSD: atavar.h,v 1.25 2002/04/23 20:41:14 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index c03c084a8d92..c1478a5a968b 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdvar.h,v 1.11 2002/01/13 17:24:30 christos Exp $	*/
+/*	$NetBSD: wdvar.h,v 1.12 2002/04/23 20:41:14 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/ic/esiop.c b/sys/dev/ic/esiop.c
index cb621ede9b74..1528fd65a8c1 100644
--- a/sys/dev/ic/esiop.c
+++ b/sys/dev/ic/esiop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esiop.c,v 1.6 2002/04/23 17:33:27 bouyer Exp $	*/
+/*	$NetBSD: esiop.c,v 1.7 2002/04/23 20:41:16 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2002 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -33,7 +33,7 @@
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.6 2002/04/23 17:33:27 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.7 2002/04/23 20:41:16 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ic/esiopvar.h b/sys/dev/ic/esiopvar.h
index 5f555da89b9c..572b5e9318e9 100644
--- a/sys/dev/ic/esiopvar.h
+++ b/sys/dev/ic/esiopvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: esiopvar.h,v 1.2 2002/04/22 15:53:40 bouyer Exp $	*/
+/*	$NetBSD: esiopvar.h,v 1.3 2002/04/23 20:41:16 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2002 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index 618512e050d7..2bdbd29c3c95 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop.c,v 1.58 2002/04/23 17:33:27 bouyer Exp $	*/
+/*	$NetBSD: siop.c,v 1.59 2002/04/23 20:41:15 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -33,7 +33,7 @@
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.58 2002/04/23 17:33:27 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.59 2002/04/23 20:41:15 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index ac67617115c9..cb8f174840b2 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_common.c,v 1.22 2002/04/23 17:33:28 bouyer Exp $	*/
+/*	$NetBSD: siop_common.c,v 1.23 2002/04/23 20:41:15 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -33,7 +33,7 @@
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.22 2002/04/23 17:33:28 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.23 2002/04/23 20:41:15 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ic/siopreg.h b/sys/dev/ic/siopreg.h
index a5ddec226cac..dad4fbb57b05 100644
--- a/sys/dev/ic/siopreg.h
+++ b/sys/dev/ic/siopreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: siopreg.h,v 1.10 2002/04/23 17:33:28 bouyer Exp $	*/
+/*	$NetBSD: siopreg.h,v 1.11 2002/04/23 20:41:15 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
diff --git a/sys/dev/ic/siopvar.h b/sys/dev/ic/siopvar.h
index bf1e9ea2042f..699ca426f70a 100644
--- a/sys/dev/ic/siopvar.h
+++ b/sys/dev/ic/siopvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: siopvar.h,v 1.17 2002/04/20 00:15:54 bouyer Exp $	*/
+/*	$NetBSD: siopvar.h,v 1.18 2002/04/23 20:41:15 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
diff --git a/sys/dev/ic/siopvar_common.h b/sys/dev/ic/siopvar_common.h
index 185ab297dd61..763ca7e150cc 100644
--- a/sys/dev/ic/siopvar_common.h
+++ b/sys/dev/ic/siopvar_common.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: siopvar_common.h,v 1.18 2002/04/23 17:33:28 bouyer Exp $	*/
+/*	$NetBSD: siopvar_common.h,v 1.19 2002/04/23 20:41:16 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
diff --git a/sys/dev/microcode/siop/esiop.ss b/sys/dev/microcode/siop/esiop.ss
index 37859e88617a..be13f1e3c386 100644
--- a/sys/dev/microcode/siop/esiop.ss
+++ b/sys/dev/microcode/siop/esiop.ss
@@ -1,4 +1,4 @@
-;	$NetBSD: esiop.ss,v 1.6 2002/04/23 20:12:39 bouyer Exp $
+;	$NetBSD: esiop.ss,v 1.7 2002/04/23 20:41:16 bouyer Exp $
 
 ;
 ; Copyright (c) 2002 Manuel Bouyer.
@@ -13,7 +13,7 @@
 ;    documentation and/or other materials provided with the distribution.
 ; 3. All advertising materials mentioning features or use of this software
 ;    must display the following acknowledgement:
-;	This product includes software developed by Manuel Bouyer
+;	This product includes software developed by Manuel Bouyer.
 ; 4. Neither the name of the University nor the names of its contributors
 ;    may be used to endorse or promote products derived from this software
 ;    without specific prior written permission.
diff --git a/sys/dev/microcode/siop/siop.ss b/sys/dev/microcode/siop/siop.ss
index 20083f1b16b5..8366769adda1 100644
--- a/sys/dev/microcode/siop/siop.ss
+++ b/sys/dev/microcode/siop/siop.ss
@@ -1,4 +1,4 @@
-;	$NetBSD: siop.ss,v 1.14 2002/04/23 12:55:28 bouyer Exp $
+;	$NetBSD: siop.ss,v 1.15 2002/04/23 20:41:16 bouyer Exp $
 
 ;
 ;  Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
 ;     documentation and/or other materials provided with the distribution.
 ;  3. All advertising materials mentioning features or use of this software
 ;     must display the following acknowledgement:
-; 	This product includes software developed by Manuel Bouyer
+; 	This product includes software developed by Manuel Bouyer.
 ;  4. The name of the author may not be used to endorse or promote products
 ;     derived from this software without specific prior written permission.
 ; 
diff --git a/sys/dev/pci/esiop_pci.c b/sys/dev/pci/esiop_pci.c
index e6cbddd77e95..9249b00d476f 100644
--- a/sys/dev/pci/esiop_pci.c
+++ b/sys/dev/pci/esiop_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esiop_pci.c,v 1.1 2002/04/21 22:52:06 bouyer Exp $	*/
+/*	$NetBSD: esiop_pci.c,v 1.2 2002/04/23 20:41:17 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2002 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -32,7 +32,7 @@
 /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.1 2002/04/21 22:52:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.2 2002/04/23 20:41:17 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 2f1c81fb748b..77cf096ac35e 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide.c,v 1.150 2002/04/14 16:55:08 bouyer Exp $	*/
+/*	$NetBSD: pciide.c,v 1.151 2002/04/23 20:41:17 bouyer Exp $	*/
 
 
 /*
@@ -14,8 +14,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -77,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.150 2002/04/14 16:55:08 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.151 2002/04/23 20:41:17 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
diff --git a/sys/dev/pci/pciide_acer_reg.h b/sys/dev/pci/pciide_acer_reg.h
index 29da10d3c2d9..10f95bca6c69 100644
--- a/sys/dev/pci/pciide_acer_reg.h
+++ b/sys/dev/pci/pciide_acer_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_acer_reg.h,v 1.5 2001/10/21 18:49:20 thorpej Exp $	*/
+/*	$NetBSD: pciide_acer_reg.h,v 1.6 2002/04/23 20:41:17 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1999 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h
index 76e7d683b528..bdda384215bf 100644
--- a/sys/dev/pci/pciide_apollo_reg.h
+++ b/sys/dev/pci/pciide_apollo_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_apollo_reg.h,v 1.10 2001/10/21 18:49:20 thorpej Exp $	*/
+/*	$NetBSD: pciide_apollo_reg.h,v 1.11 2002/04/23 20:41:17 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_cmd_reg.h b/sys/dev/pci/pciide_cmd_reg.h
index 69e8c166d5cd..a85c8067d245 100644
--- a/sys/dev/pci/pciide_cmd_reg.h
+++ b/sys/dev/pci/pciide_cmd_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_cmd_reg.h,v 1.11 2001/11/15 20:48:17 bouyer Exp $	*/
+/*	$NetBSD: pciide_cmd_reg.h,v 1.12 2002/04/23 20:41:18 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_cy693_reg.h b/sys/dev/pci/pciide_cy693_reg.h
index 4d0523ed199c..88b8c7b2dae6 100644
--- a/sys/dev/pci/pciide_cy693_reg.h
+++ b/sys/dev/pci/pciide_cy693_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_cy693_reg.h,v 1.5 2001/10/21 18:49:20 thorpej Exp $	*/
+/*	$NetBSD: pciide_cy693_reg.h,v 1.6 2002/04/23 20:41:18 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_hpt_reg.h b/sys/dev/pci/pciide_hpt_reg.h
index 7c603ba16961..93755ee1eec2 100644
--- a/sys/dev/pci/pciide_hpt_reg.h
+++ b/sys/dev/pci/pciide_hpt_reg.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: pciide_hpt_reg.h,v 1.5 2001/10/21 18:49:20 thorpej Exp $       */
+/*      $NetBSD: pciide_hpt_reg.h,v 1.6 2002/04/23 20:41:18 bouyer Exp $       */
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
+ *      This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_pdc202xx_reg.h b/sys/dev/pci/pciide_pdc202xx_reg.h
index 7346e5028839..836aff969c26 100644
--- a/sys/dev/pci/pciide_pdc202xx_reg.h
+++ b/sys/dev/pci/pciide_pdc202xx_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_pdc202xx_reg.h,v 1.6 2001/10/21 18:49:20 thorpej Exp $ */
+/*	$NetBSD: pciide_pdc202xx_reg.h,v 1.7 2002/04/23 20:41:18 bouyer Exp $ */
 
 /*
  * Copyright (c) 1999 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_piix_reg.h b/sys/dev/pci/pciide_piix_reg.h
index 04270a8d63f9..f08844ac9cc9 100644
--- a/sys/dev/pci/pciide_piix_reg.h
+++ b/sys/dev/pci/pciide_piix_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_piix_reg.h,v 1.6 2001/10/21 18:49:20 thorpej Exp $	*/
+/*	$NetBSD: pciide_piix_reg.h,v 1.7 2002/04/23 20:41:18 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/pciide_sis_reg.h b/sys/dev/pci/pciide_sis_reg.h
index 672fd0a80d2c..068f5664c8e8 100644
--- a/sys/dev/pci/pciide_sis_reg.h
+++ b/sys/dev/pci/pciide_sis_reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_sis_reg.h,v 1.8 2001/10/21 18:49:20 thorpej Exp $	*/
+/*	$NetBSD: pciide_sis_reg.h,v 1.9 2002/04/23 20:41:18 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c
index 406439ffad47..046dab0b3f17 100644
--- a/sys/dev/pci/siop_pci.c
+++ b/sys/dev/pci/siop_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_pci.c,v 1.10 2002/04/20 00:15:55 bouyer Exp $	*/
+/*	$NetBSD: siop_pci.c,v 1.11 2002/04/23 20:41:18 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -32,7 +32,7 @@
 /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.10 2002/04/20 00:15:55 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.11 2002/04/23 20:41:18 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c
index c561be25e6d3..30268ef09eac 100644
--- a/sys/dev/pci/siop_pci_common.c
+++ b/sys/dev/pci/siop_pci_common.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_pci_common.c,v 1.14 2002/04/23 17:33:28 bouyer Exp $	*/
+/*	$NetBSD: siop_pci_common.c,v 1.15 2002/04/23 20:41:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -32,7 +32,7 @@
 /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.14 2002/04/23 17:33:28 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.15 2002/04/23 20:41:19 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/pci/siop_pci_common.h b/sys/dev/pci/siop_pci_common.h
index 5f7d8abafac2..83765a5c7887 100644
--- a/sys/dev/pci/siop_pci_common.h
+++ b/sys/dev/pci/siop_pci_common.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: siop_pci_common.h,v 1.3 2002/04/20 00:15:55 bouyer Exp $	*/
+/*	$NetBSD: siop_pci_common.h,v 1.4 2002/04/23 20:41:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
diff --git a/sys/dev/scsipi/atapi_wdc.c b/sys/dev/scsipi/atapi_wdc.c
index 92cb39a30b41..f225bd61b521 100644
--- a/sys/dev/scsipi/atapi_wdc.c
+++ b/sys/dev/scsipi/atapi_wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: atapi_wdc.c,v 1.50 2002/04/05 18:27:56 bouyer Exp $	*/
+/*	$NetBSD: atapi_wdc.c,v 1.51 2002/04/23 20:41:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -33,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.50 2002/04/05 18:27:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.51 2002/04/23 20:41:19 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
diff --git a/sys/dev/scsipi/cd_atapi.c b/sys/dev/scsipi/cd_atapi.c
index c570ff58f240..8f7c2ce3d9ae 100644
--- a/sys/dev/scsipi/cd_atapi.c
+++ b/sys/dev/scsipi/cd_atapi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd_atapi.c,v 1.19 2002/01/09 18:48:18 drochner Exp $	*/
+/*	$NetBSD: cd_atapi.c,v 1.20 2002/04/23 20:41:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Charles M. Hannum.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd_atapi.c,v 1.19 2002/01/09 18:48:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd_atapi.c,v 1.20 2002/04/23 20:41:19 bouyer Exp $");
 
 #include "rnd.h"
 
diff --git a/sys/dev/scsipi/cdvar.h b/sys/dev/scsipi/cdvar.h
index f53128d4660f..6a8733d1ced6 100644
--- a/sys/dev/scsipi/cdvar.h
+++ b/sys/dev/scsipi/cdvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdvar.h,v 1.13 2001/04/25 17:53:39 bouyer Exp $	*/
+/*	$NetBSD: cdvar.h,v 1.14 2002/04/23 20:41:20 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -13,7 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by Charles M. Hannum.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c
index e1b04a3535ae..1d159a593f55 100644
--- a/sys/dev/scsipi/st_atapi.c
+++ b/sys/dev/scsipi/st_atapi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: st_atapi.c,v 1.7 2001/12/07 11:26:30 yamt Exp $ */
+/*	$NetBSD: st_atapi.c,v 1.8 2002/04/23 20:41:20 bouyer Exp $ */
 
 /*
  * Copyright (c) 2001 Manuel Bouyer.
@@ -13,8 +13,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ *	This product includes software developed by Manuel Bouyer.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -33,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.7 2001/12/07 11:26:30 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.8 2002/04/23 20:41:20 bouyer Exp $");
 
 #include "opt_scsi.h"
 #include "rnd.h"