2 files changed, 8 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 5e073ef6..3795b833 100644
--- a/.hgtags
+++ b/.hgtags
@@ -58,3 +58,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3
 73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
 53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4
+ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
diff --git a/CHANGES.txt b/CHANGES.txt
index daa7622d..74e28d6e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,13 @@ Added several features that were slated for setuptools 0.6c12:
 * Issue #3: Fixed NameError in SSL support.
 
 ------
+0.6.45
+------
+
+* Issue #379: ``distribute_setup.py`` now traps VersionConflict as well,
+  restoring ability to upgrade from an older setuptools version.
+
+------
 0.6.44
 ------