diff --git a/c/src/lib/libbsp/i386/ChangeLog b/c/src/lib/libbsp/i386/ChangeLog
index c1805ce179..e3e9df6d40 100644
--- a/c/src/lib/libbsp/i386/ChangeLog
+++ b/c/src/lib/libbsp/i386/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-25	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* shared/comm/tty_drv.c, shared/comm/tty_drv.h:
+	Remove CVS-Headers. Add CVS-Ids.
+
 2011-04-11	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* shared/irq/irq_asm.S: Rename rtems_smp_maximum_processors to
diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c
index 02d962188b..79bdd250c9 100644
--- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.c
+++ b/c/src/lib/libbsp/i386/shared/comm/tty_drv.c
@@ -1,6 +1,4 @@
 /***************************************************************************
- *
- * $Header$
  *
  * MODULE DESCRIPTION:
  * This module implements the RTEMS drivers for the PC serial ports
@@ -17,6 +15,10 @@
  *
  ****************************************************************************/
 
+/*
+ * $Id$
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h b/c/src/lib/libbsp/i386/shared/comm/tty_drv.h
index f2d855fcea..e48e74cd81 100644
--- a/c/src/lib/libbsp/i386/shared/comm/tty_drv.h
+++ b/c/src/lib/libbsp/i386/shared/comm/tty_drv.h
@@ -1,8 +1,6 @@
 #ifndef __tty_drv__
 #define __tty_drv__
 /***************************************************************************
- *
- * $Header$
  *
  * Copyright (c) 1999 ConnectTel, Inc. All Rights Reserved.
  *
@@ -14,6 +12,10 @@
  *
  ****************************************************************************/
 
+/*
+ * $Id$
+ */
+
 /* functions */
 #ifdef __cplusplus
 extern "C" {