diff --git a/src/java/org/apache/commons/collections/BufferUnderflowException.java b/src/java/org/apache/commons/collections/BufferUnderflowException.java
index 204543070..16291a5ab 100644
--- a/src/java/org/apache/commons/collections/BufferUnderflowException.java
+++ b/src/java/org/apache/commons/collections/BufferUnderflowException.java
@@ -1,10 +1,10 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUnderflowException.java,v 1.8 2003/10/09 20:58:52 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUnderflowException.java,v 1.9 2004/01/06 21:43:08 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2004 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,19 +57,23 @@
  */
 package org.apache.commons.collections;
 
+import java.util.NoSuchElementException;
+
 /**
  * The BufferUnderflowException is used when the buffer is already empty.
+ * <p>
+ * NOTE: From version 3.0, this exception extends NoSuchElementException.
  * 
  * @since Commons Collections 2.1
- * @version $Revision: 1.8 $ $Date: 2003/10/09 20:58:52 $
+ * @version $Revision: 1.9 $ $Date: 2004/01/06 21:43:08 $
  *
  * @author Avalon
- * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
+ * @author Berin Loritsch
+ * @author Jeff Turner
  * @author Paul Jack
  * @author Stephen Colebourne
  */
-public class BufferUnderflowException extends RuntimeException {
+public class BufferUnderflowException extends NoSuchElementException {
     
     /** The root cause throwable */
     private final Throwable throwable;