diff --git a/app-emulation/qemu/qemu-0.12.4.bep b/app-emulation/qemu/qemu-0.12.4.bep
index 61bd081b7..65f565d02 100644
--- a/app-emulation/qemu/qemu-0.12.4.bep
+++ b/app-emulation/qemu/qemu-0.12.4.bep
@@ -1,13 +1,11 @@
 DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer." 
 HOMEPAGE="http://wiki.qemu.org/" 
-COPYRIGHT="2003 Fabrice Bellard"
-LICENSE="GNU GPLv2"
-
 SRC_URI="http://download.savannah.gnu.org/releases/qemu/qemu-0.12.4.tar.gz"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="93e6b134dff89b2799f57b7d9e0e0fc5"
+
 BUILD {
 	cd qemu-0.12.4
 	./configure --prefix=/boot/common
@@ -18,3 +16,6 @@ INSTALL {
 	cd qemu-0.12.4
 	make install
 }
+
+COPYRIGHT="2003 Fabrice Bellard"
+LICENSE="GNU GPL v2"
diff --git a/app-text/aspell/aspell-0.60.6.bep b/app-text/aspell/aspell-0.60.6.bep
index 63a2fc85a..418387baf 100644
--- a/app-text/aspell/aspell-0.60.6.bep
+++ b/app-text/aspell/aspell-0.60.6.bep
@@ -19,5 +19,5 @@ INSTALL {
 	cd aspell-0.60.6
 	make install
 }
-LICENSE="GNU GPL"
-COPYRIGHT="2000-2008"
+LICENSE="GNU LGPL v2"
+COPYRIGHT="2000-2006 Kevin Atkinson"
diff --git a/dev-python/pygame/pygame-1.9.1.bep b/dev-python/pygame/pygame-1.9.1.bep
index 014168202..37d69521a 100644
--- a/dev-python/pygame/pygame-1.9.1.bep
+++ b/dev-python/pygame/pygame-1.9.1.bep
@@ -19,7 +19,7 @@ INSTALL {
 	cd pygame-1.9.1release
 	python setup.py install --root=${DESTDIR}
 }
-LICENSE="LGPL-2.1"
+LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2000-2004, 2007  Pete Shinners
 	2004 Takafumi Mizuno
 	2006-2007 Rene Dudfield
diff --git a/dev-util/ctags/ctags-5.8.bep b/dev-util/ctags/ctags-5.8.bep
index c8af126e4..73a66b7bf 100644
--- a/dev-util/ctags/ctags-5.8.bep
+++ b/dev-util/ctags/ctags-5.8.bep
@@ -16,5 +16,5 @@ INSTALL {
 		make install prefix=${DESTDIR}/boot/common
 }
 
-LICENSE="GNU GPLv2"
+LICENSE="GNU GPL v2"
 COPYRIGHT="1996-2009, Darren Hiebert"
diff --git a/dev-vcs/bzr/bzr-2.2.0.bep b/dev-vcs/bzr/bzr-2.2.0.bep
index e3c49415f..c3999cdba 100644
--- a/dev-vcs/bzr/bzr-2.2.0.bep
+++ b/dev-vcs/bzr/bzr-2.2.0.bep
@@ -30,5 +30,6 @@ INSTALL {
 	fi
 }
 
-LICENSE="GNU GPL v2, GNU GPL v3"
+LICENSE="GNU GPL v2
+	GNU GPL v3"
 COPYRIGHT="2007-2010 The Bazaar Team"
diff --git a/dev-vcs/bzr/bzr-2.2b4.bep b/dev-vcs/bzr/bzr-2.2b4.bep
index e386341f1..d58e19065 100644
--- a/dev-vcs/bzr/bzr-2.2b4.bep
+++ b/dev-vcs/bzr/bzr-2.2b4.bep
@@ -30,5 +30,6 @@ INSTALL {
 	fi
 }
 
-LICENSE="GNU GPL v2, GNU GPL v3"
+LICENSE="GNU GPL v2
+	GNU GPL v3"
 COPYRIGHT="2007-2010 The Bazaar Team"
diff --git a/media-gfx/pngcrush/pngcrush-1.7.11.bep b/media-gfx/pngcrush/pngcrush-1.7.11.bep
index 4fc02039e..7a3cd49f2 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.11.bep
+++ b/media-gfx/pngcrush/pngcrush-1.7.11.bep
@@ -5,9 +5,7 @@ CHECKSUM_MD5="f9f5adfd36c5b0b84e0a5115e841e38a"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-LICENSE="PNG"
-COPYRIGHT="1998-2009 Glenn Randers-Pehrson
-		2005 Greg Roelofs"
+
 BUILD {
 	cd pngcrush-1.7.11-nolib
 	make
@@ -17,3 +15,7 @@ INSTALL {
 	mkdir -p ${DESTDIR}/boot/common/bin
 	cp -a -f pngcrush ${DESTDIR}/boot/common/bin
 }
+
+LICENSE="LibPNG"
+COPYRIGHT="1998-2009 Glenn Randers-Pehrson
+		2005 Greg Roelofs"
diff --git a/media-gfx/pngcrush/pngcrush-1.7.6.bep b/media-gfx/pngcrush/pngcrush-1.7.6.bep
index 0ddef0ae3..ef7238fe3 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.6.bep
+++ b/media-gfx/pngcrush/pngcrush-1.7.6.bep
@@ -14,6 +14,6 @@ INSTALL {
 	cd pngcrush-1.7.6-nolib
 	cp -a -f pngcrush /boot/common/bin
 }
-LICENSE="PNG"
+LICENSE="LibPNG"
 COPYRIGHT="1998-2009 Glenn Randers-Pehrson
 		2005 Greg Roelofs"
diff --git a/media-libs/ilmbase/ilmbase-1.0.1.bep b/media-libs/ilmbase/ilmbase-1.0.1.bep
index a0af4547f..9cd591226 100644
--- a/media-libs/ilmbase/ilmbase-1.0.1.bep
+++ b/media-libs/ilmbase/ilmbase-1.0.1.bep
@@ -17,5 +17,5 @@ INSTALL {
 	cd ilmbase-1.0.1
 	make install
 }
-LICENSE="Industrial Light & Magic"
+LICENSE="BSD (3-clause)"
 COPYRIGHT="2006 Industrial Light & Magic"
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.bep b/media-libs/ilmbase/ilmbase-1.0.2.bep
index 03eeac519..26ab2ea1c 100644
--- a/media-libs/ilmbase/ilmbase-1.0.2.bep
+++ b/media-libs/ilmbase/ilmbase-1.0.2.bep
@@ -18,5 +18,5 @@ INSTALL {
 	cd ilmbase-1.0.2
 	make install
 }
-LICENSE="BSD (3 clause)"
+LICENSE="BSD (3-clause)"
 COPYRIGHT="2002, 2004-2007 Industrial Light & Magic"
diff --git a/media-libs/libmad/libmad-0.15.1.bep b/media-libs/libmad/libmad-0.15.1.bep
index ed16c7266..1d4a8bafc 100644
--- a/media-libs/libmad/libmad-0.15.1.bep
+++ b/media-libs/libmad/libmad-0.15.1.bep
@@ -26,5 +26,6 @@ INSTALL {
 	cd  libmad-0.15.1b
 	make install
 }
-LICENSE="GNU GPLv2"
+
+LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
diff --git a/media-video/vlc/vlc-0.8.6i.bep b/media-video/vlc/vlc-0.8.6i.bep
index 4ea04db8b..b863b4a49 100644
--- a/media-video/vlc/vlc-0.8.6i.bep
+++ b/media-video/vlc/vlc-0.8.6i.bep
@@ -23,5 +23,6 @@ INSTALL {
 	cd vlc-0.8.6i
 	make install
 }
-LICENSE="GNU GPLv2"
+
+LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2008"