diff --git a/debian/changelog b/debian/changelog
index bdafb53..aa27327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,11 @@ ubuntu-dev-tools (0.98) UNRELEASED; urgency=low
   [ Emmet Hikory ]
   * doc/mk-sbuild.1: add missing options to summary
 
- -- Emmet Hikory <persia@ubuntu.com>  Sun, 11 Apr 2010 17:29:42 +0900
+  [ Michael Bienia ]
+  * lp-shell: Use "udt-lp-shell" as LP API consumer instead of the non-unique
+    "test" (lp: #558531).
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 13 Apr 2010 18:41:36 +0200
 
 ubuntu-dev-tools (0.97) lucid; urgency=low
 
diff --git a/doc/lp-shell.1 b/doc/lp-shell.1
index 611bf21..bda5000 100644
--- a/doc/lp-shell.1
+++ b/doc/lp-shell.1
@@ -13,8 +13,8 @@ lp\-shell \- Open an interactive launchpadlib shell.
 opens an interactive Python shell with a launchpadlib.Launchpad object "lp"
 which is ready for use.
 
-It authenticates against Launchpad with the consumer name "test". When using
-\fBlp\-shell\fR with the \fB\-a\fR option it will use the anonymous login
+It authenticates against Launchpad with the consumer name "udt-lp-shell". When
+using \fBlp\-shell\fR with the \fB\-a\fR option it will use the anonymous login
 from launchpadlib.Launchpad.
 
 By default \fBlp\-shell\fR connects to the "\fIedge\fR" Launchpad service
diff --git a/lp-shell b/lp-shell
index 5cdda73..7b86b54 100755
--- a/lp-shell
+++ b/lp-shell
@@ -50,11 +50,11 @@ if len(args) >= 2:
         print 'I: Falling back to "1.0".'
 
 if options.anonymous:
-    lp = Launchpad.login_anonymously('test', instance, version=api_version)
+    lp = Launchpad.login_anonymously('udt-lp-shell', instance, version=api_version)
     banner = 'Connected anonymously to LP service "%s" with API version "%s":' % (
             instance, api_version)
 else:
-    lp = Launchpad.login_with('test', instance, version=api_version)
+    lp = Launchpad.login_with('udt-lp-shell', instance, version=api_version)
     banner = 'Connected to LP service "%s" with API version "%s":' % (
             instance, api_version)