diff --git a/ChangeLog b/ChangeLog
index f358e50c7..246a72f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-16  Johan Danielsson  <joda@pdc.kth.se>
+
+	* admin/copy.c: don't copy an entry that already exists in the
+	keytab, and warn if the keyblock differs
+
 2000-12-15  Johan Danielsson  <joda@pdc.kth.se>
 
 	* admin/Makefile.am: merge srvconvert and srvcreate with copy