diff --git a/debian/control.woody b/debian/control.woody
index b974a1ad4b..43b968ab55 100644
--- a/debian/control.woody
+++ b/debian/control.woody
@@ -6,38 +6,34 @@ Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-
 Standards-Version: 3.5.6
 
 Package: vlc
+Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: vlc-gui, vlc-plugin-mad, vlc-plugin-a52
 Suggests: gnome-vlc
-Description: a free MPEG, DVD and DivX player
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files,
- DVDs, or MPEG streams from a network source.
+Description: a complete multimedia player
+ This is the VLC media player. It plays MPEG, MPEG2, MPEG4, DivX, mp3,
+ Ogg/Vorbis files, DVDs, and multimedia streams from network sources.
 
 Package: libvlc0-dev
 Section: devel
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: development files for the VideoLAN Client
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
+Description: development files for VLC
  This package contains headers and a static library required to build plugins
- for the VideoLAN Client, or standalone applications using VideoLAN Client.
+ for VLC, or standalone applications that use VLC features.
 
 Package: gnome-vlc
+Section: graphics
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Recommends: vlc-plugin-esd
 Conflicts: vlc-gnome (<< 0.5.0)
 Replaces: vlc-gnome (<< 0.5.0)
 Provides: vlc-gui
-Description: GNOME frontend for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds a Gnome interface to vlc, the VideoLAN Client. To
- activate it, use the `--intf gnome' flag or run the `gnome-vlc' program.
+Description: GNOME frontend for VLC
+ This plugin adds a Gnome interface to the VLC media player. To activate
+ it, use the `--intf gnome' flag or run the `gnome-vlc' program.
 
 Package: vlc-gnome
 Architecture: any
@@ -51,11 +47,9 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
 Replaces: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
 Provides: vlc-gui
-Description: Gtk+ frontend for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds a Gtk+ interface to vlc, the VideoLAN Client. To
- activate it, use the `--intf gtk' flag or run the `gvlc' program.
+Description: Gtk+ frontend for VLC
+ This plugin adds a Gtk+ interface to the VLC media player. To activate
+ it, use the `--intf gtk' flag or run the `gvlc' program.
 
 Package: vlc-gtk
 Architecture: any
@@ -68,12 +62,10 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-esd (<< 0.5.0)
 Replaces: vlc-esd (<< 0.5.0)
-Description: Esound audio output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds support for the Enlightened Sound Daemon to vlc, the
- VideoLAN Client. To activate it, use the `--aout esd' flag or select
- the `esd' aout plugin from the preferences menu.
+Description: Esound audio output plugin for VLC
+ This plugin adds support for the Enlightened Sound Daemon to the VLC
+ media player. To activate it, use the `--aout esd' flag or select the
+ `esd' audio output plugin from the preferences menu.
 
 Package: vlc-esd
 Architecture: any
@@ -86,12 +78,10 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-alsa (<< 0.5.0)
 Replaces: vlc-alsa (<< 0.5.0)
-Description: ALSA audio output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
+Description: ALSA audio output plugin for VLC
  This plugin adds support for the Advanced Linux Sound Architecture to
- vlc, the VideoLAN Client. To activate it, use the `--aout alsa' flag or
- select the `alsa' aout plugin from the preferences menu.
+ the VLC media player. To activate it, use the `--aout alsa' flag or
+ select the `alsa' audio output plugin from the preferences menu.
 
 Package: vlc-alsa
 Architecture: any
@@ -104,13 +94,11 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-sdl (<< 0.5.0)
 Replaces: vlc-sdl (<< 0.5.0)
-Description: SDL video and audio output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
+Description: SDL video and audio output plugin for VLC
  This plugin adds support for the Simple DirectMedia Layer library to
- vlc, the VideoLAN Client. To activate it, use the `--vout sdl' or
- `--aout sdl' flags or select the `sdl' vout or aout plugin from the
- preferences menu.
+ the VLC media player. To activate it, use the `--vout sdl' or
+ `--aout sdl' flags or select the `sdl' video or audio output plugin
+ from the preferences menu.
 
 Package: vlc-sdl
 Architecture: any
@@ -123,12 +111,10 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-ggi (<< 0.5.0)
 Replaces: vlc-ggi (<< 0.5.0)
-Description: GGI video output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This is a GGI plugin for vlc, the VideoLAN Client.  To activate it, use
- the `--vout ggi' flag or select the `ggi' vout plugin from the preferences
- menu.
+Description: GGI video output plugin for VLC
+ This is a GGI plugin for the VLC media player.  To activate it, use
+ the `--vout ggi' flag or select the `ggi' video output plugin from the
+ preferences menu.
 
 Package: vlc-ggi
 Architecture: any
@@ -141,12 +127,10 @@ Architecture: i386
 Depends: vlc (= ${Source-Version}), libglide2
 Conflicts: vlc-glide (<< 0.5.0)
 Replaces: vlc-glide (<< 0.5.0)
-Description: Glide video output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This is a Glide (3dfx) plugin for vlc, the VideoLAN Client. To activate
- it, use the `--vout glide' flag or select the `glide' vout plugin from
- the preferences menu.
+Description: Glide video output plugin for VLC
+ This is a Glide (3dfx) plugin for the VLC media player. To activate
+ it, use the `--vout glide' flag or select the `glide' video output
+ plugin from the preferences menu.
 
 Package: vlc-glide
 Architecture: any
@@ -160,11 +144,9 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-qt (<< 0.5.0)
 Replaces: vlc-qt (<< 0.5.0)
 Provides: vlc-gui
-Description: Qt frontend for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds a Qt interface to vlc, the VideoLAN Client. To
- activate it, use the `--intf qt' flag or run the `qvlc' program.
+Description: Qt frontend for VLC
+ This plugin adds a Qt interface to the VLC media player. To activate it,
+ use the `--intf qt' flag or run the `qvlc' program.
 
 Package: vlc-qt
 Architecture: any
@@ -177,11 +159,9 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-mad (<< 0.5.0)
 Replaces: vlc-mad (<< 0.5.0)
-Description: MAD audio codec plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
+Description: MAD audio codec plugin for VLC
  This plugin adds support for libmad, the MPEG audio decoder library,
- to the VideoLAN Client. MAD is 100% fixed-point based. The plugin is
+ to the VLC media player. MAD is 100% fixed-point based. The plugin is
  autodetected.
 
 Package: vlc-mad
@@ -195,12 +175,10 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-arts (<< 0.5.0)
 Replaces: vlc-arts (<< 0.5.0)
-Description: aRts audio output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds support for the aRts Sound System to vlc, the
- VideoLAN Client. To activate it, use the `--aout arts' flag or
- select the `arts' aout plugin from the preferences menu.
+Description: aRts audio output plugin for VLC
+ This plugin adds support for the aRts Sound System to the VLC media
+ player. To activate it, use the `--aout arts' flag or select the `arts'
+ audio output plugin from the preferences menu.
 
 Package: vlc-arts
 Architecture: any
@@ -213,11 +191,10 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-lirc (<< 0.5.0)
 Replaces: vlc-lirc (<< 0.5.0)
-Description: lirc (infrared remote control) interface plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin is an infrared lirc interface for vlc, the
- VideoLAN Client. To activate it, use the `--intf lirc' flag.
+Description: lirc (infrared remote control) interface plugin for VLC
+ This plugin is an infrared lirc interface for the VLC media player. To
+ activate it, use the `--extraintf lirc' flag or select the `lirc' extra
+ interface plugin from the preferences menu.
 
 Package: vlc-lirc
 Architecture: any
@@ -230,12 +207,10 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-aa (<< 0.5.0)
 Replaces: vlc-aa (<< 0.5.0)
-Description: ASCII art video output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This is an ASCII art video output plugin for vlc, the VideoLAN
- Client. To activate it, use the `--vout aa' flag or select the `aa'
- vout plugin from the preferences menu.
+Description: ASCII art video output plugin for VLC
+ This is an ASCII art video output plugin for the VLC media player. To
+ activate it, use the `--vout aa' flag or select the `aa' video output
+ plugin from the preferences menu.
 
 Package: vlc-aa
 Architecture: any
@@ -248,24 +223,20 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-xosd (<< 0.5.0)
 Replaces: vlc-xosd (<< 0.5.0)
-Description: X On-Screen Display plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This is an On-Screen Display plugin for vlc, the VideoLAN Client. To
- activate it, use the `--intf xosd' flag or select the `xosd' interface
- plugin from the preferences menu.
+Description: X On-Screen Display plugin for VLC
+ This is an On-Screen Display plugin for the VLC media player. To
+ activate it, use the `--extraintf xosd' flag or select the `xosd'
+ extra interface plugin from the preferences menu.
 
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Recommends: mozilla-browser
-Description: a multimedia plugin for Mozilla, based on vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds support for MPEG, MPEG2, DVD and DivX to your Mozilla
- browser. The decoding process is done by vlc and the output window is
- embedded in a webpage or directly in the browser window. There is also
- support for fullscreen display and javascript control.
+Description: a multimedia plugin for Mozilla based on VLC
+ This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
+ more formats to your Mozilla browser. The decoding process is done by VLC
+ and the output window is embedded in a webpage or directly in the browser
+ window. There is also support for fullscreen display and javascript control.
 
 Package: kvlc
 Architecture: any
@@ -274,19 +245,15 @@ Recommends: vlc-plugin-arts
 Conflicts: vlc-kde (<< 0.5.0)
 Replaces: vlc-kde (<< 0.5.0)
 Provides: vlc-gui
-Description: KDE frontend for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds a KDE interface to vlc, the VideoLAN Client. To
- activate it, use the `--intf kde' flag or run the `kvlc' program.
+Description: KDE frontend for VLC
+ This plugin adds a KDE interface to the VLC media player. To activate it,
+ use the `--intf kde' flag or run the `kvlc' program.
 
 Package: vlc-plugin-svgalib
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: SVGAlib video output plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds support for SVGAlib to vlc, the VideoLAN Client. To
+Description: SVGAlib video output plugin for VLC
+ This plugin adds support for SVGAlib to the VLC media player. To
  activate it, use the `--vout svgalib' flag or select the `svgalib' video
  output plugin from the preferences menu. Note that you will need root
  permissions to use SVGAlib.
@@ -294,46 +261,36 @@ Description: SVGAlib video output plugin for vlc
 Package: vlc-plugin-dv
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: DV codec plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds support for the DV video format to vlc, the VideoLAN
- Client. The plugin is autodetected.
+Description: DV codec plugin for VLC
+ This plugin adds support for the DV video format to the VLC media player.
+ The plugin is autodetected.
 
 Package: vlc-plugin-a52
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: A-52 (AC-3) codec plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
+Description: A-52 (AC-3) codec plugin for VLC
  This plugin adds support for the ATSC A-52 (aka. AC-3) audio format to
- vlc, the VideoLAN Client. The plugin is autodetected.
+ the VLC media player. The plugin is autodetected.
 
 Package: vlc-plugin-dvb
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: DVB input plugin for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds support for DVB cards to vlc, the VideoLAN Client. Note
- that your card needs to be supported by your kernel before vlc can use it.
+Description: DVB input plugin for VLC
+ This plugin adds support for DVB cards to the VLC media player. Note
+ that your card needs to be supported by your kernel before VLC can use it.
 
 Package: vlc-plugin-ogg
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: Ogg demuxer and Vorbis codec plugins for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
+Description: Ogg demuxer and Vorbis codec plugins for VLC
  These plugins add support for the Ogg bitstream format and the Ogg Vorbis
- compressed audio format to vlc, the VideoLAN Client. They are autodetected.
+ compressed audio format to the VLC media player. They are autodetected.
 
 Package: wxvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Provides: vlc-gui
-Description: wxWindows frontend for vlc
- VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
- .
- This plugin adds a wxWindow interface to vlc, the VideoLAN Client. To
+Description: wxWindows frontend for VLC
+ This plugin adds a wxWindow interface to the VLC media player. To
  activate it, use the `--intf wxwin' flag or run the `wxvlc' program.
 
diff --git a/debian/gnome-vlc.desktop b/debian/gnome-vlc.desktop
index 213c430cec..fda30d0691 100644
--- a/debian/gnome-vlc.desktop
+++ b/debian/gnome-vlc.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=GNOME VideoLAN Client
-Name[fr]=Client VideoLAN pour GNOME
-Comment=GNOME DVD and MPEG player
-Comment[fr]=Lecteur de DVD et MPEG pour GNOME
+Name=VLC for GNOME
+Name[fr]=VLC pour GNOME
+Comment=GNOME media player
+Comment[fr]=Lecteur multimédia pour GNOME
 Exec=gnome-vlc
 Icon=gnome-vlc.png
 Terminal=0
diff --git a/debian/gnome-vlc.menu b/debian/gnome-vlc.menu
index 2a9b297c4c..035fae4f36 100644
--- a/debian/gnome-vlc.menu
+++ b/debian/gnome-vlc.menu
@@ -1,3 +1,3 @@
 ?package(gnome-vlc):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \
-                    section="Apps/Viewers" title="Gnome VideoLAN Client" \
+                    section="Apps/Viewers" title="VLC media player for GNOME" \
                     icon="/usr/share/vlc/gnome-vlc.xpm" hints="Video"
diff --git a/debian/gvlc.desktop b/debian/gvlc.desktop
index 7e1d9faaa5..d6673daca1 100644
--- a/debian/gvlc.desktop
+++ b/debian/gvlc.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Gtk+ VideoLAN Client
-Name[fr]=Client VideoLAN pour Gtk+
-Comment=Gtk+ DVD and MPEG player
-Comment[fr]=Lecteur de DVD et MPEG pour Gtk+
+Name=VLC for Gtk+
+Name[fr]=VLC pour Gtk+
+Comment=Gtk+ multimedia player
+Comment[fr]=Lecteur multimédia pour Gtk+
 Exec=gvlc
 Icon=gvlc.png
 Terminal=0
diff --git a/debian/gvlc.menu b/debian/gvlc.menu
index c4a6c967a1..661baf0dd0 100644
--- a/debian/gvlc.menu
+++ b/debian/gvlc.menu
@@ -1,3 +1,3 @@
 ?package(gvlc):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="Gtk+ VideoLAN Client" \
+               section="Apps/Viewers" title="VLC media player for Gtk+" \
                icon="/usr/share/vlc/gvlc.xpm" hints="Video"
diff --git a/debian/kvlc.menu b/debian/kvlc.menu
index 0a2d4ef99f..f9608eb076 100644
--- a/debian/kvlc.menu
+++ b/debian/kvlc.menu
@@ -1,3 +1,3 @@
 ?package(kvlc):command="/usr/bin/kvlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="KDE VideoLAN Client" \
+               section="Apps/Viewers" title="VLC media player for KDE" \
                icon="/usr/share/vlc/kvlc.xpm" hints="Video"
diff --git a/debian/qvlc.menu b/debian/qvlc.menu
index b2faadb5c4..d80289bbbc 100644
--- a/debian/qvlc.menu
+++ b/debian/qvlc.menu
@@ -1,3 +1,3 @@
 ?package(qvlc):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="Qt VideoLAN Client" \
+               section="Apps/Viewers" title="VLC media player for Qt" \
                icon="/usr/share/vlc/qvlc.xpm" hints="Video"
diff --git a/debian/vlc.desktop b/debian/vlc.desktop
index aec9503ca3..b385c6a5ca 100644
--- a/debian/vlc.desktop
+++ b/debian/vlc.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=VideoLAN Client
-Name[fr]=Client VideoLAN
-Comment=DVD and MPEG player
-Comment[fr]=Lecteur de DVD et MPEG
+Name=VLC
+Name[fr]=VLC
+Comment=multimedia player
+Comment[fr]=Lecteur multimédia
 Exec=vlc
 Icon=vlc.png
 Terminal=0
diff --git a/debian/vlc.menu b/debian/vlc.menu
index b0d05d8d28..503e522494 100644
--- a/debian/vlc.menu
+++ b/debian/vlc.menu
@@ -1,3 +1,3 @@
 ?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
-              section="Apps/Viewers" title="VideoLAN Client" \
+              section="Apps/Viewers" title="VLC media player" \
               icon="/usr/share/vlc/vlc.xpm" hints="Video"
diff --git a/debian/wxvlc.menu b/debian/wxvlc.menu
index ba1632c241..24da91d845 100644
--- a/debian/wxvlc.menu
+++ b/debian/wxvlc.menu
@@ -1,3 +1,3 @@
 ?package(wxvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
-                section="Apps/Viewers" title="VideoLAN Client for wxWindows" \
+                section="Apps/Viewers" title="VLC media player for wxWindows" \
                 icon="/usr/share/vlc/vlc.xpm" hints="Video"