diff --git a/schema/ListedLicense.xsd b/schema/ListedLicense.xsd
index a9e682c06..c20f24e8d 100644
--- a/schema/ListedLicense.xsd
+++ b/schema/ListedLicense.xsd
@@ -47,7 +47,6 @@
 			<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
 		</all>
 		<attribute name="licenseId" type="string" use="required" />
-		<attribute name="isDeprecated" type="boolean"/>
 		<attribute name="name" type="string" use="required" />
 		<attribute name="listVersionAdded" type="string"/>
 		<attribute name="deprecatedVersion" type="string"/>
@@ -108,15 +107,6 @@
 				</documentation>
 			</annotation>
 		</attribute>
-		<attribute name="isDeprecated" type="boolean">
-			<annotation>
-				<documentation xml:lang="en">
-					<xhtml:p>
-						<xhtml:code>isDeprecated</xhtml:code> is true if and only if the short identifier has been superseded by another.  See the <xhtml:code>deprecatedVersion</xhtml:code> documentation for more details.
-					</xhtml:p>
-				</documentation>
-			</annotation>
-		</attribute>
 		<attribute name="name" type="string" use="required">
 			<annotation>
 				<documentation xml:lang="en">
diff --git a/src/AGPL-1.0.xml b/src/AGPL-1.0.xml
index 32aa2a643..31e5978b3 100644
--- a/src/AGPL-1.0.xml
+++ b/src/AGPL-1.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="false" licenseId="AGPL-1.0"
             name="Affero General Public License v1.0"
-            isDeprecated="true" deprecatedVersion="3.1">
+            deprecatedVersion="3.1">
       <crossRefs>
          <crossRef>http://www.affero.org/oagpl.html</crossRef>
       </crossRefs>
diff --git a/src/AGPL-3.0.xml b/src/AGPL-3.0.xml
index 8dc0a72c6..b5c182cc9 100644
--- a/src/AGPL-3.0.xml
+++ b/src/AGPL-3.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="AGPL-3.0" isOsiApproved="true"
   name="GNU Affero General Public License v3.0"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/agpl.txt</crossRef>
       <crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>
diff --git a/src/GFDL-1.1.xml b/src/GFDL-1.1.xml
index 8e9a282eb..1165aaf94 100644
--- a/src/GFDL-1.1.xml
+++ b/src/GFDL-1.1.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="GFDL-1.1" isOsiApproved="false"
   name="GNU Free Documentation License v1.1"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt</crossRef>
     </crossRefs>
diff --git a/src/GFDL-1.2.xml b/src/GFDL-1.2.xml
index 1c86619e9..1cef37366 100644
--- a/src/GFDL-1.2.xml
+++ b/src/GFDL-1.2.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="GFDL-1.2" isOsiApproved="false"
   name="GNU Free Documentation License v1.2"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt</crossRef>
     </crossRefs>
diff --git a/src/GFDL-1.3.xml b/src/GFDL-1.3.xml
index 3c1d10a9f..261cc2dec 100644
--- a/src/GFDL-1.3.xml
+++ b/src/GFDL-1.3.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="GFDL-1.3" isOsiApproved="false"
   name="GNU Free Documentation License v1.3"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/fdl-1.3.txt</crossRef>
     </crossRefs>
diff --git a/src/GPL-1.0+.xml b/src/GPL-1.0+.xml
index 71a6134f1..7a8f4523e 100644
--- a/src/GPL-1.0+.xml
+++ b/src/GPL-1.0+.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" isOsiApproved="false" licenseId="GPL-1.0+"
+   <license deprecatedVersion="2.0rc2" isOsiApproved="false" licenseId="GPL-1.0+"
             name="GNU General Public License v1.0 or later">
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
diff --git a/src/GPL-1.0.xml b/src/GPL-1.0.xml
index e00c472e4..8f7a7d775 100644
--- a/src/GPL-1.0.xml
+++ b/src/GPL-1.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="GPL-1.0" isOsiApproved="false"
   name="GNU General Public License v1.0 only"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
     </crossRefs>
diff --git a/src/GPL-2.0+.xml b/src/GPL-2.0+.xml
index c53b9ccb1..99a53d38d 100644
--- a/src/GPL-2.0+.xml
+++ b/src/GPL-2.0+.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="true" licenseId="GPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="true" licenseId="GPL-2.0+" deprecatedVersion="2.0rc2"
             name="GNU General Public License v2.0 or later">
 	  <notes>DEPRECATED: Use the license identifier GPL-2.0-or-later</notes>
       <crossRefs>
diff --git a/src/GPL-2.0-with-GCC-exception.xml b/src/GPL-2.0-with-GCC-exception.xml
index 9cca82234..f6c01a80b 100644
--- a/src/GPL-2.0-with-GCC-exception.xml
+++ b/src/GPL-2.0-with-GCC-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-GCC-exception"
+   <license deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-GCC-exception"
             name="GNU General Public License v2.0 w/GCC Runtime Library exception">
       <crossRefs>
          <crossRef>https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10</crossRef>
diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml
index 82a242f4b..e124bff58 100644
--- a/src/GPL-2.0-with-autoconf-exception.xml
+++ b/src/GPL-2.0-with-autoconf-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-autoconf-exception"
+   <license deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-autoconf-exception"
             name="GNU General Public License v2.0 w/Autoconf exception">
       <crossRefs>
          <crossRef>http://ac-archive.sourceforge.net/doc/copyright.html</crossRef>
diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml
index 3b514903c..e070f67f6 100644
--- a/src/GPL-2.0-with-bison-exception.xml
+++ b/src/GPL-2.0-with-bison-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-bison-exception"
+   <license deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-bison-exception"
             name="GNU General Public License v2.0 w/Bison exception">
       <crossRefs>
          <crossRef>http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id=193d7c7054ba7197b0789e14965b739162319b5e#n141</crossRef>
diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml
index 35624e85b..a21e5f53f 100644
--- a/src/GPL-2.0-with-classpath-exception.xml
+++ b/src/GPL-2.0-with-classpath-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-classpath-exception"
+   <license deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-classpath-exception"
             name="GNU General Public License v2.0 w/Classpath exception">
       <crossRefs>
          <crossRef>http://www.gnu.org/software/classpath/license.html</crossRef>
diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml
index c9279eb23..6a35c350a 100644
--- a/src/GPL-2.0-with-font-exception.xml
+++ b/src/GPL-2.0-with-font-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-font-exception"
+   <license deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-font-exception"
             name="GNU General Public License v2.0 w/Font exception">
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gpl-faq.html#FontException</crossRef>
diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml
index 954beda0c..f5a331af8 100644
--- a/src/GPL-2.0.xml
+++ b/src/GPL-2.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="GPL-2.0" isOsiApproved="true"
   name="GNU General Public License v2.0 only"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>
diff --git a/src/GPL-3.0+.xml b/src/GPL-3.0+.xml
index 29374c387..e34c3886f 100644
--- a/src/GPL-3.0+.xml
+++ b/src/GPL-3.0+.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="true" licenseId="GPL-3.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="true" licenseId="GPL-3.0+" deprecatedVersion="2.0rc2"
             name="GNU General Public License v3.0 or later">
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
diff --git a/src/GPL-3.0-with-GCC-exception.xml b/src/GPL-3.0-with-GCC-exception.xml
index 673f4eba3..2537e242d 100644
--- a/src/GPL-3.0-with-GCC-exception.xml
+++ b/src/GPL-3.0-with-GCC-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="true" licenseId="GPL-3.0-with-GCC-exception" isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="true" licenseId="GPL-3.0-with-GCC-exception" deprecatedVersion="2.0rc2"
             name="GNU General Public License v3.0 w/GCC Runtime Library exception">
 	  <notes>DEPRECATED: Use License Expression Syntax and Exceptions list to create equivalent license.</notes>
       <crossRefs>
diff --git a/src/GPL-3.0-with-autoconf-exception.xml b/src/GPL-3.0-with-autoconf-exception.xml
index fcd8e5fef..3765a7c20 100644
--- a/src/GPL-3.0-with-autoconf-exception.xml
+++ b/src/GPL-3.0-with-autoconf-exception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-3.0-with-autoconf-exception"
+   <license deprecatedVersion="2.0rc2" licenseId="GPL-3.0-with-autoconf-exception"
             name="GNU General Public License v3.0 w/Autoconf exception">
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/autoconf-exception-3.0.html</crossRef>
diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml
index c33e1e9ce..febe60f59 100644
--- a/src/GPL-3.0.xml
+++ b/src/GPL-3.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="GPL-3.0" isOsiApproved="true"
   name="GNU General Public License v3.0 only"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>
diff --git a/src/LGPL-2.0+.xml b/src/LGPL-2.0+.xml
index c662a1b18..79bf3e201 100644
--- a/src/LGPL-2.0+.xml
+++ b/src/LGPL-2.0+.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="true" licenseId="LGPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="true" licenseId="LGPL-2.0+" deprecatedVersion="2.0rc2"
             name="GNU Library General Public License v2 or later">
 	  <notes>DEPRECATED: Use the license identifier LGPL-2.0-or-later</notes>
       <crossRefs>
diff --git a/src/LGPL-2.0.xml b/src/LGPL-2.0.xml
index d17093cda..4a43f6779 100644
--- a/src/LGPL-2.0.xml
+++ b/src/LGPL-2.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="LGPL-2.0" isOsiApproved="true"
   name="GNU Library General Public License v2 only"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
     </crossRefs>
diff --git a/src/LGPL-2.1+.xml b/src/LGPL-2.1+.xml
index ca6df532a..40c97f18a 100644
--- a/src/LGPL-2.1+.xml
+++ b/src/LGPL-2.1+.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="true" licenseId="LGPL-2.1+"  isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="true" licenseId="LGPL-2.1+" deprecatedVersion="2.0rc2"
             name="GNU Library General Public License v2.1 or later">
 	  <notes>DEPRECATED: Use the license identifier LGPL-2.1-or-later</notes>
       <crossRefs>
diff --git a/src/LGPL-2.1.xml b/src/LGPL-2.1.xml
index dc416c383..bbdffcc30 100644
--- a/src/LGPL-2.1.xml
+++ b/src/LGPL-2.1.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="LGPL-2.1" isOsiApproved="true"
   name="GNU Lesser General Public License v2.1 only"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/LGPL-2.1</crossRef>
diff --git a/src/LGPL-3.0+.xml b/src/LGPL-3.0+.xml
index e736838b3..4e51b221c 100644
--- a/src/LGPL-3.0+.xml
+++ b/src/LGPL-3.0+.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="true" licenseId="LGPL-3.0+"  isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="true" licenseId="LGPL-3.0+"  deprecatedVersion="2.0rc2"
             name="GNU Lesser General Public License v3.0 or later">
 	  <notes>DEPRECATED: Use the license identifier LGPL-3.0-or-later</notes>
       <crossRefs>
diff --git a/src/LGPL-3.0.xml b/src/LGPL-3.0.xml
index 6b2ad1705..9ae27a683 100644
--- a/src/LGPL-3.0.xml
+++ b/src/LGPL-3.0.xml
@@ -2,7 +2,7 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
   <license licenseId="LGPL-3.0" isOsiApproved="true"
   name="GNU Lesser General Public License v3.0 only"
-  isDeprecated="true" deprecatedVersion="3.0">
+  deprecatedVersion="3.0">
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>
diff --git a/src/Nunit.xml b/src/Nunit.xml
index dab3ee072..47cf5ad3c 100644
--- a/src/Nunit.xml
+++ b/src/Nunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="3.0" licenseId="Nunit" name="Nunit License">
+   <license deprecatedVersion="3.0" licenseId="Nunit" name="Nunit License">
       <crossRefs>
          <crossRef>https://fedoraproject.org/wiki/Licensing/Nunit</crossRef>
       </crossRefs>
diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml
index ba556230f..72cd0e4d2 100644
--- a/src/StandardML-NJ.xml
+++ b/src/StandardML-NJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isOsiApproved="false" licenseId="StandardML-NJ" isDeprecated="true" deprecatedVersion="2.0rc2"
+   <license isOsiApproved="false" licenseId="StandardML-NJ" deprecatedVersion="2.0rc2"
             name="Standard ML of New Jersey License">
 	  <notes>DEPRECATED: This license was added twice (as of v1.17 and then in v1.20) by accident. Use short identifier: SMLNJ</notes>
       <crossRefs>
diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml
index 921049f6a..740b9c2e8 100644
--- a/src/eCos-2.0.xml
+++ b/src/eCos-2.0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="eCos-2.0" name="eCos license version 2.0">
+   <license deprecatedVersion="2.0rc2" licenseId="eCos-2.0" name="eCos license version 2.0">
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/ecos-license.html</crossRef>
       </crossRefs>
diff --git a/src/wxWindows.xml b/src/wxWindows.xml
index 5fb7f110e..34e3ed18f 100644
--- a/src/wxWindows.xml
+++ b/src/wxWindows.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
-   <license licenseId="wxWindows" name="wxWindows Library License"  isDeprecated="true" deprecatedVersion="2.0rc2">
+   <license licenseId="wxWindows" name="wxWindows Library License" deprecatedVersion="2.0rc2">
       <crossRefs>
          <crossRef>http://www.opensource.org/licenses/WXwindows</crossRef>
       </crossRefs>