diff --git a/src/java/org/apache/commons/logging/LogConfigurationException.java b/src/java/org/apache/commons/logging/LogConfigurationException.java
index fb90cac..9c9ab3f 100644
--- a/src/java/org/apache/commons/logging/LogConfigurationException.java
+++ b/src/java/org/apache/commons/logging/LogConfigurationException.java
@@ -24,9 +24,8 @@ package org.apache.commons.logging;
  * factory methods.</p>
  *
  * @author Craig R. McClanahan
- * @version $Revision$ $Date$
+ * @version $Id$
  */
-
 public class LogConfigurationException extends RuntimeException {
 
 
diff --git a/src/java/org/apache/commons/logging/LogFactory.java b/src/java/org/apache/commons/logging/LogFactory.java
index 297b29a..72b22db 100644
--- a/src/java/org/apache/commons/logging/LogFactory.java
+++ b/src/java/org/apache/commons/logging/LogFactory.java
@@ -47,9 +47,8 @@ import java.util.Properties;
  * @author Craig R. McClanahan
  * @author Costin Manolache
  * @author Richard A. Sitze
- * @version $Revision$ $Date$
+ * @version $Id$
  */
-
 public abstract class LogFactory {
     // Implementation note re AccessController usage
     //
diff --git a/src/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/java/org/apache/commons/logging/impl/AvalonLogger.java
index 2efd3c8..2c11b10 100644
--- a/src/java/org/apache/commons/logging/impl/AvalonLogger.java
+++ b/src/java/org/apache/commons/logging/impl/AvalonLogger.java
@@ -50,7 +50,7 @@ import org.apache.commons.logging.Log;
  * is not considered to be an incompatible change.
  * </p>
  * @author <a href="mailto:neeme@apache.org">Neeme Praks</a>
- * @version $Revision$ $Date$
+ * @version $Id$
  */
 public class AvalonLogger implements Log {
 
diff --git a/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
index 51f3bec..9dfcd40 100644
--- a/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
+++ b/src/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
@@ -39,10 +39,9 @@ import org.apache.commons.logging.Log;
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  * @author <a href="mailto:vince256@comcast.net">Vince Eagen</a>
- * @version $Revision$ $Date$
+ * @version $Id$
  * @since 1.1
  */
-
 public class Jdk13LumberjackLogger implements Log, Serializable {
 
 
diff --git a/src/java/org/apache/commons/logging/impl/Jdk14Logger.java b/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
index 2e4fa19..195af4a 100644
--- a/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
+++ b/src/java/org/apache/commons/logging/impl/Jdk14Logger.java
@@ -34,9 +34,8 @@ import org.apache.commons.logging.Log;
  * @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
- * @version $Revision$ $Date$
+ * @version $Id$
  */
-
 public class Jdk14Logger implements Log, Serializable {
 
     /**
diff --git a/src/java/org/apache/commons/logging/impl/Log4JLogger.java b/src/java/org/apache/commons/logging/impl/Log4JLogger.java
index c938d08..3dcdb5f 100644
--- a/src/java/org/apache/commons/logging/impl/Log4JLogger.java
+++ b/src/java/org/apache/commons/logging/impl/Log4JLogger.java
@@ -46,7 +46,6 @@ import org.apache.log4j.Level;
  * @author Robert Burrell Donkin
  * @version $Id$
  */
-
 public class Log4JLogger implements Log, Serializable {
 
     // ------------------------------------------------------------- Attributes
diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index 609097c..f0354aa 100644
--- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -63,9 +63,8 @@ import org.apache.commons.logging.LogFactory;
  * @author Craig R. McClanahan
  * @author Richard A. Sitze
  * @author Brian Stansberry
- * @version $Revision$ $Date$
+ * @version $Id$
  */
-
 public class LogFactoryImpl extends LogFactory {
 
 
diff --git a/src/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/java/org/apache/commons/logging/impl/LogKitLogger.java
index cec09b5..a9fd836 100644
--- a/src/java/org/apache/commons/logging/impl/LogKitLogger.java
+++ b/src/java/org/apache/commons/logging/impl/LogKitLogger.java
@@ -37,7 +37,6 @@ import org.apache.commons.logging.Log;
  * @author Robert Burrell Donkin
  * @version $Id$
  */
-
 public class LogKitLogger implements Log, Serializable {
 
 
diff --git a/src/java/org/apache/commons/logging/impl/ServletContextCleaner.java b/src/java/org/apache/commons/logging/impl/ServletContextCleaner.java
index 51da68b..d24fc0f 100644
--- a/src/java/org/apache/commons/logging/impl/ServletContextCleaner.java
+++ b/src/java/org/apache/commons/logging/impl/ServletContextCleaner.java
@@ -46,9 +46,9 @@ import org.apache.commons.logging.LogFactory;
  * every accessible LogFactory class that the entry in its map for the
  * current webapp's context classloader should be cleared.
  * 
+ * @version $Id$
  * @since 1.1
  */
-
 public class ServletContextCleaner implements ServletContextListener {
 
     private static final Class[] RELEASE_SIGNATURE = {ClassLoader.class};
diff --git a/src/java/org/apache/commons/logging/impl/WeakHashtable.java b/src/java/org/apache/commons/logging/impl/WeakHashtable.java
index 0157bfb..2bc0a41 100644
--- a/src/java/org/apache/commons/logging/impl/WeakHashtable.java
+++ b/src/java/org/apache/commons/logging/impl/WeakHashtable.java
@@ -112,6 +112,7 @@ import java.util.Set;
  *
  * @author Brian Stansberry
  * 
+ * @version $Id$
  * @since 1.1
  */
 public final class WeakHashtable extends Hashtable {