diff --git a/.gitignore b/.gitignore
index c508810..8da56b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /license-validate-3.tar.gz
 /license-validate-4.tar.gz
 /license-validate-5.tar.gz
+/license-validate-6.tar.gz
diff --git a/license-validate.spec b/license-validate.spec
index 90bc137..9d4f8c2 100644
--- a/license-validate.spec
+++ b/license-validate.spec
@@ -1,5 +1,5 @@
 Name:           license-validate
-Version:        5
+Version:        6
 Release:        1%{?dist}
 Summary:        Validate SPEC license string
 
@@ -11,7 +11,7 @@ URL:            https://pagure.io/copr/license-validate/
 Source0:        %{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-Requires:       rpminspect-data-fedora
+Requires:       fedora-license-data
 
 # man pages
 BuildRequires:  asciidoc
@@ -31,7 +31,10 @@ Validate whether the license string conforms to Fedora Licensing.
 
 
 %build
-./create-grammar.py fedora-approved-licenses.txt > full-grammar.lark
+./generate-shortnames.py > fedora-shortnames.txt
+./generate-spdx-ids.py > fedora-spdx.txt
+./create-grammar.py grammar.lark fedora-spdx.txt > full-grammar.lark
+./create-grammar.py grammar-shortnames.lark fedora-shortnames.txt > full-grammar-shortnames.lark
 for i in license-validate.1.asciidoc license-fedora2spdx.asciidoc; do
   a2x -d manpage -f manpage "$i"
 done
@@ -43,7 +46,8 @@ install license-validate.py %{buildroot}%{_bindir}/license-validate
 install license-fedora2spdx.py %{buildroot}%{_bindir}/license-fedora2spdx
 
 mkdir -p %{buildroot}%{_datadir}/%{name}/
-install full-grammar.lark %{buildroot}%{_datadir}/%{name}/grammar.lark
+install -m644 full-grammar.lark %{buildroot}%{_datadir}/%{name}/grammar.lark
+install -m644 full-grammar-shortnames.lark %{buildroot}%{_datadir}/%{name}/grammar-shortnames.lark
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -m644 license-validate.1 %{buildroot}/%{_mandir}/man1/
@@ -51,6 +55,7 @@ install -m644 license-fedora2spdx.1 %{buildroot}/%{_mandir}/man1/
 
 %check
 ./validate-grammar.py full-grammar.lark
+./validate-grammar.py full-grammar-shortnames.lark
 
 %files
 %license LICENSE
@@ -63,6 +68,12 @@ install -m644 license-fedora2spdx.1 %{buildroot}/%{_mandir}/man1/
 
 
 %changelog
+* Sat Jun 04 2022 Miroslav Suchý <msuchy@redhat.com> 6-1
+- add rawhide releaser
+- validate using SPDX and introduce --old for previous behaviour
+- migrate to fedora-license-data
+- add helpers to generate list of licenses from fedora-license-data
+
 * Fri Apr 22 2022 Miroslav Suchý <msuchy@redhat.com> 5-1
 - 2077908 - add missing requires on rpminspect-data-fedora (msuchy@redhat.com)
 - fix man page (msuchy@redhat.com)
diff --git a/sources b/sources
index f3bfa2d..5530878 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (license-validate-5.tar.gz) = b596b9ae1bdbd5c2cb8c67ecee14856c6412890ff53a66b4f6675465699d6390023a42876d59306fd0d3dc426e9c9d4341bc3abd8d93ffd229a7c85014089539
+SHA512 (license-validate-6.tar.gz) = b335c76a5ac72437320dc51fea3b834db6e357d4573c02e8d2acf837d37bc53c975bf080e67a6797f735f395123b8aa894ba242a2afb4c4eb2990b071a2b3c7f