diff --git a/NEWS b/NEWS
index 36ae7b65..c9d69a80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 0.118:
 - support of added .changes in commit message template
 - make submit request listing fast by server side filtering
+- allow pulling of conflicting changes via "osc repairlink"
 - bugfix: templates in edit commit message causes an empty commit logs
 
 0.117:
diff --git a/TODO b/TODO
index 6ee3623d..e1c28ccf 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,6 @@
 
 MAJOR:
 
-  - changelog handling (equivalent of Novell-internal 'vc' tool, I guess)
-    (should also work with multiple spec files <package-name>-<repository-name>.spec, and with <package-name>-<version>.spec)
-    see http://lists.opensuse.org/opensuse-buildservice/2007-08/msg00170.html
-
-  
 NORMAL:
 
   - improvements submit requests: