diff --git a/NEWS b/NEWS
index bcc94576..53a1032d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,26 @@
-jw:
-- add --debuginfo to osc build.
-
 since 0.99:
 
+- new command submitreq, to handle "submit requests" (next generation build
+  service feature). See http://en.opensuse.org/Build_Service/Collaboration
+- new link handling:
+  add support for handling linked packages in expanded form. They
+  can be checked out, updated (expanding or unexpanding them),
+  and built locally.
+  Newly introduced options are:
+  * osc checkout: --expand-link
+  * osc update: --expand-link and --unexpand-link
+- new feature: package tracking. It's not enabled by default and
+   needs to be switched on with do_package_tracking=1 in .oscrc.
+   before using. See
+   http://lists.opensuse.org/opensuse-buildservice/2008-03/msg00114.html
+- prjresults: add --csv option
+- req: add option -a / --add-header to inject arbitrary request headers
+- addremove (and others): ignore _all_ dot files (the buildservice doesn't
+  handle them)
+- copypac: do a (quicker) server-side copy by default, when source and target
+  are on the same buildservice instance.
 - build:
+  - add --debuginfo
   - add --no-verify
   - add --local-package to build a package which doesn't exist on the server
   - add --alternative-project to specify a project, if the current one doesn't
diff --git a/TODO b/TODO
index 389d2a5f..04f35b2e 100644
--- a/TODO
+++ b/TODO
@@ -5,27 +5,16 @@ MAJOR:
     (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
 
-  - think about how to locally build "linked" packages
-    http://lists4.opensuse.org/opensuse-buildservice/2007-07/msg00043.html
-    https://bugzilla.novell.com/show_bug.cgi?id=212565
-    draft on source code branching: 
-    http://en.opensuse.org/Build_Service/Concepts/Source_branching
-    draft on merge request handling:
-    http://en.opensuse.org/Build_Service/Concepts/Merge_Request
-
   
 NORMAL:
 
   - Extending the diff command to take -rREV:REV as argument and show the
     diff between those two (server-side) revisions
     note: there is a 'rdiff' subcommand meanwhile, which implements this.
-  - add support for local build of packages which do not exist / have not been
-    created yet in the buildservice
   - split functionality that needs prj/pac as commandline arguments into a seperate tool (oscremote? osc -r?)
   - status: implement -u option as in svn          [3]
   - implement (svn-like) switch command
   - implement 'mv' command
-  - use urllib.urlencode for parameter encoding (or check if this is the case already?)
   - _real_ SSL support, with certificate verification
   - copypac: put the current release number into the spec file before sending it
     - for this, it is required to scan all current binaries, pick the highest release number 
@@ -36,6 +25,7 @@ NORMAL:
     when opening .oscrc and someone is looking over the shoulder
     - use http://code.google.com/p/iniparse/ instead of ConfigParser, with
       write capability, for the change
+    - or implement Juergen Weigert's idea of a on-demand password agent
   - add switch to commit to change repository options, like to e.g. disable publishing?
   - implement optional logging to .osc/log, which could be useful for debugging bugs like
     the one where api.opensuse.org sends empty replies (a hard-to-catch one)
@@ -54,7 +44,6 @@ MINOR:
     -> see incarnations of obs_mirror_project, in particular James Oakleys 
        obs_mirror_project.py
     this can peruse the new get_binarylist() and get_binary_file() functions
-  - add option to disable gpg key checking?
   - adjust zsh completion to work with cmdln.py implementation
   - add support for adding tags to packages?