diff --git a/src/as-spdx.c b/src/as-spdx.c
index 2e6a4a9e1..56dbb5261 100644
--- a/src/as-spdx.c
+++ b/src/as-spdx.c
@@ -440,15 +440,21 @@ as_license_to_spdx_id (const gchar *license)
 		{ " with advertising",		NULL },
 		{ " and ",			" AND " },
 		{ " or ",			" OR " },
+		{ "AGPL",			"AGPL-3.0" },
+		{ "AGPL3",			"AGPL-3.0" },
 		{ "AGPLv3+",			"AGPL-3.0" },
 		{ "AGPLv3",			"AGPL-3.0" },
 		{ "Artistic 2.0",		"Artistic-2.0" },
+		{ "Artistic2.0",		"Artistic-2.0" },
 		{ "Artistic clarified",		"Artistic-2.0" },
 		{ "Artistic",			"Artistic-1.0" },
 		{ "ASL 1.1",			"Apache-1.1" },
 		{ "ASL 2.0",			"Apache-2.0" },
+		{ "Apache",			"Apache-2.0" },
+		{ "APACHE",			"Apache-2.0" },
 		{ "Boost",			"BSL-1.0" },
 		{ "BSD",			"BSD-3-Clause" },
+		{ "CCPL",			"CC0-1.0" },
 		{ "CC0",			"CC0-1.0" },
 		{ "CC-BY-SA",			"CC-BY-SA-3.0" },
 		{ "CC-BY",			"CC-BY-3.0" },
@@ -463,26 +469,39 @@ as_license_to_spdx_id (const gchar *license)
 		{ "GPL+",			"GPL-1.0+" },
 		{ "GPLv2+",			"GPL-2.0+" },
 		{ "GPLv2",			"GPL-2.0" },
+		{ "GPL2",			"GPL-2.0" },
 		{ "GPLv3+",			"GPL-3.0+" },
 		{ "GPLv3",			"GPL-3.0" },
+		{ "GPL3",			"GPL-3.0" },
+		{ "FDL1.2",			"GFDL-1.2-only" },
+		{ "FDL1.3",			"GFDL-1.3-only" },
 		{ "IBM",			"IPL-1.0" },
+		{ "LGPL",			"LGPL-2.1" },
 		{ "LGPL+",			"LGPL-2.1+" },
 		{ "LGPLv2.1",			"LGPL-2.1" },
 		{ "LGPLv2+",			"LGPL-2.1+" },
 		{ "LGPLv2",			"LGPL-2.1" },
 		{ "LGPLv3+",			"LGPL-3.0+" },
 		{ "LGPLv3",			"LGPL-3.0" },
+		{ "LGPL3",			"LGPL-3.0" },
 		{ "LPPL",			"LPPL-1.3c" },
 		{ "MPLv1.0",			"MPL-1.0" },
 		{ "MPLv1.1",			"MPL-1.1" },
+		{ "MPL",			"MPL-1.1" },
+		{ "MPL2",			"MPL-2.0" },
 		{ "MPLv2.0",			"MPL-2.0" },
 		{ "Netscape",			"NPL-1.1" },
 		{ "OFL",			"OFL-1.1" },
+		{ "PerlArtistic"		"Artistic-1.0-Perl" },
+		{ "PHP",			"PHP-3.01" },
+		{ "PSF",			"Python-2.0" },
 		{ "Python",			"Python-2.0" },
 		{ "QPL",			"QPL-1.0" },
+		{ "RUBY",			"Ruby" },
 		{ "SPL",			"SPL-1.0" },
 		{ "UPL",			"UPL-1.0" },
 		{ "zlib",			"Zlib" },
+		{ "ZPL",			"ZPL-2.1" },
 		{ "ZPLv2.0",			"ZPL-2.0" },
 		{ "Unlicense",			"CC0-1.0" },
 		{ "Public Domain",		"LicenseRef-public-domain" },