--- LICENSE-orig	2011-10-19 13:09:32.895052004 -0500
+++ LICENSE	2011-10-19 18:35:21.430225673 -0500
@@ -1,17 +1,35 @@
 All PulseAudio source files are licensed under the GNU Lesser General Public
 License. (see file LGPL for details)
 
-However, the server side links to the GPL-only library 'libsamplerate' which
-practically downgrades the license of the server part to GPL (see file GPL for
-details), exercising section 3 of the LGPL.
+However, the server side has optional GPL dependencies.  These include the
+'libsamplerate' library and the bluetooth bluez module.  If these optional
+dependencies are built with PulseAudio, then this effectively downgrades the
+license of the server part to GPL (see file GPL for details), exercising
+section 3 of the LGPL.
 
 Hence you should treat the client library ('libpulse') of PulseAudio as being
 LGPL licensed and the server part ('libpulsecore') as being GPL licensed. Since
 the PulseAudio daemon and the modules link to 'libpulsecore' they are of course
 also GPL licensed.
 
+So, the following PulseAudio binaries link against libpulsecore, and
+are GPL if libpulsecore is built with a GPL dependency:
+- $(bindir)/pulseaudio
+- $(libdir)/libpulsecore*
+- $(libexec)/proximinity-helper binary is also GPL.
+- $(libexec)/gconf_helper
+- Many test programs in the tests directory.
+
 Andre Adrian's echo cancellation implementation is licensed under a less
 restrictive license - see src/modules/echo-cancel/adrian-license.txt for
 details.
 
+Also, the following files in PulseAudio use the more permissive MIT license:
+   - pulseaudio-1.0/src/modules/reserve-monitor.c
+   - pulseaudio-1.0/src/modules/reserve.c
+   - pulseaudio-1.0/src/pulsecore/rtkit.c
+
+And the following file uses a more permissive Sun license:
+   - pulseaudio-1.0/src/pulsecore/g711.c:
+
 -- Lennart Poettering, April 20th, 2006.