diff --git a/IPython/Debugger.py b/IPython/Debugger.py
index cb5d97e..bcdc55a 100644
--- a/IPython/Debugger.py
+++ b/IPython/Debugger.py
@@ -15,20 +15,15 @@ details on the PSF (Python Software Foundation) standard license, see:
 
 http://www.python.org/2.2.3/license.html
 
-$Id: Debugger.py 2261 2007-04-20 17:50:00Z jdh2358 $"""
+$Id: Debugger.py 2902 2007-12-28 12:28:01Z vivainio $"""
 
 #*****************************************************************************
 #
-# Since this file is essentially a modified copy of the pdb module which is
-# part of the standard Python distribution, I assume that the proper procedure
-# is to maintain its copyright as belonging to the Python Software Foundation
-# (in addition to my own, for all new code).
+#       This file is licensed under the PSF license.
 #
 #       Copyright (C) 2001 Python Software Foundation, www.python.org
 #       Copyright (C) 2005-2006 Fernando Perez. <fperez@colorado.edu>
 #
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
 #
 #*****************************************************************************
 
diff --git a/IPython/external/simplegeneric.py b/IPython/external/simplegeneric.py
index d8c6d5b..556d6f2 100644
--- a/IPython/external/simplegeneric.py
+++ b/IPython/external/simplegeneric.py
@@ -1,12 +1,21 @@
-__all__ = ["generic"]
-
-from types import ClassType, InstanceType
-classtypes = type, ClassType
+#Name: simplegeneric
+#Version: 0.6
+#Summary: Simple generic functions (similar to Python's own len(), pickle.dump(), etc.)
+#Home-page: http://cheeseshop.python.org/pypi/simplegeneric
+#Author: Phillip J. Eby
+#Author-email: peak@eby-sarna.com
+#License: PSF or ZPL
 
 # This is version 0.6 of Philip J. Eby's simplegeneric module
 # (http://cheeseshop.python.org/pypi/simplegeneric) patched to work
 # with Python 2.3 (which doesn't support assigning to __name__)
 
+__all__ = ["generic"]
+
+
+from types import ClassType, InstanceType
+classtypes = type, ClassType
+
 def generic(func):
     """Create a simple generic function"""
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2960523..0501eb7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -2,6 +2,10 @@
 
 	* ipy_server.py: TCP socket server for "remote control" of an IPython 
 	instance.
+	
+	* Debugger.py: Change to PSF license
+	
+	* simplegeneric.py: Add license & author notes.
 
 2007-12-28  Fernando Perez  <Fernando.Perez@colorado.edu>