diff --git a/osc/babysitter.py b/osc/babysitter.py
index c25278ca..c0e7c838 100644
--- a/osc/babysitter.py
+++ b/osc/babysitter.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2008 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2008 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
diff --git a/osc/build.py b/osc/build.py
index 46512015..05674ce1 100644
--- a/osc/build.py
+++ b/osc/build.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2006 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
diff --git a/osc/commandline.py b/osc/commandline.py
index c1c42fd0..5d214ffa 100755
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # vim: sw=4 et
 
-# Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2006 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
@@ -268,7 +268,7 @@ class Osc(cmdln.Cmdln):
         opens the program specified by the environmental variable EDITOR with a
         temporary file. Alternatively, content to be saved can be supplied via
         the --file switch. If the argument is '-', input is taken from stdin:
-        osc meta prjconf home:poeml | sed ... | osc meta prjconf home:poeml -F -
+        osc meta prjconf home:user | sed ... | osc meta prjconf home:user -F -
 
         When trying to edit a non-existing resource, it is created implicitely.
 
@@ -2497,8 +2497,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
         Note the global -A and -H options (see osc help).
 
         Examples:
-          osc req /source/home:poeml
-          osc req -m PUT -f /etc/fstab source/home:poeml/test5/myfstab
+          osc req /source/home:user
+          osc req -m PUT -f /etc/fstab source/home:user/test5/myfstab
 
         ${cmd_usage}
         ${cmd_option_list}
diff --git a/osc/conf.py b/osc/conf.py
index b8ae6c56..7f7e72eb 100644
--- a/osc/conf.py
+++ b/osc/conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2006 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
@@ -18,9 +18,9 @@ After reading the config, urllib2 is initialized.
 The configuration dictionary could look like this:
 
 {'apisrv': 'https://api.opensuse.org/',
- 'user': 'poeml',
- 'api_host_options': {'api.opensuse.org': {'user': 'poeml', 'pass': 'secret'},
-                      'apitest.opensuse.org': {'user': 'poeml', 'pass': 'secret',
+ 'user': 'joe',
+ 'api_host_options': {'api.opensuse.org': {'user': 'joe', 'pass': 'secret'},
+                      'apitest.opensuse.org': {'user': 'joe', 'pass': 'secret',
                                                'http_headers':(('Host','api.suse.de'),
                                                                ('User','faye'))},
                       'foo.opensuse.org': {'user': 'foo', 'pass': 'foo'}},
diff --git a/osc/core.py b/osc/core.py
index 1598ca2a..49f15bd3 100755
--- a/osc/core.py
+++ b/osc/core.py
@@ -2,7 +2,7 @@
 
 # vim: sw=4 et
 
-# Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2006 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
diff --git a/osc/fetch.py b/osc/fetch.py
index 3b8abe7b..b270bc94 100644
--- a/osc/fetch.py
+++ b/osc/fetch.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2006 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
diff --git a/osc/meter.py b/osc/meter.py
index 4eeba7ac..286ff1fc 100644
--- a/osc/meter.py
+++ b/osc/meter.py
@@ -17,7 +17,7 @@
 # this is basically a copy of python-urlgrabber's TextMeter class, 
 # with support added for dynamical sizing according to screen size.
 # it uses getScreenWidth() scrapped from smart.
-# Peter Poeml <poeml@suse.de>
+# 2007-04-24, poeml
 
 
 from urlgrabber.progress import BaseMeter, format_time, format_number
diff --git a/osc/oscerr.py b/osc/oscerr.py
index 61d9344e..67275489 100644
--- a/osc/oscerr.py
+++ b/osc/oscerr.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2008 Peter Poeml / Novell Inc.  All rights reserved.
+# Copyright (C) 2008 Novell Inc.  All rights reserved.
 # This program is free software; it may be used, copied, modified
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
diff --git a/setup.py b/setup.py
index 39d47b76..741d3fec 100755
--- a/setup.py
+++ b/setup.py
@@ -5,8 +5,8 @@ from distutils.core import setup
 setup(name='osc',
       version='0.7',
       description='opensuse commander',
-      author='Peter Poeml',
-      author_email='poeml@suse.de',
+      author='openSUSE project',
+      author_email='opensuse-buildservice@opensuse.org',
       license='GPL',
       url='https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python/osc/',