diff --git a/kitty-do-not-build-kitten.patch b/kitty-do-not-build-kitten.patch
index 0cdf093..203e23f 100644
--- a/kitty-do-not-build-kitten.patch
+++ b/kitty-do-not-build-kitten.patch
@@ -1,23 +1,3 @@
-diff --git a/gen-go-code.py b/gen-go-code.py
-index 25b902fa1..fc54b722b 100755
---- a/gen-go-code.py
-+++ b/gen-go-code.py
-@@ -12,6 +12,7 @@
- import subprocess
- import sys
- import tarfile
-+import shutil
- from contextlib import contextmanager, suppress
- from functools import lru_cache
- from itertools import chain
-@@ -851,6 +852,7 @@ def main() -> None:
-             generate_unicode_names(src, dest)
-     generate_ssh_kitten_data()
- 
-+    shutil.copy('constants_generated.go','src/kitty')
-     update_completion()
-     update_at_commands()
-     kitten_clis()
 diff --git a/setup.py b/setup.py
 index 5d866c993..3174fc47f 100755
 --- a/setup.py
diff --git a/kitty.spec b/kitty.spec
index 180b3f1..1f43a9e 100644
--- a/kitty.spec
+++ b/kitty.spec
@@ -43,7 +43,7 @@ Summary:        Cross-platform, fast, feature full, GPU based terminal emulator
 # golang.org/x/image: BSD-3-Clause
 # golang.org/x/sys: BSD-3-Clause
 # howett.net/plist: BSD-2-Clause AND BSD-3-Clause
-License:        GPL-3.0-only AND LGPL-2.1-or-later AND Zlib AND BSD-1-Clause AND MIT AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND MPL-2.0 AND (BSD-2-Clause AND BSD-3-Clause)
+License:        GPL-3.0-only AND LGPL-2.1-or-later AND Zlib AND BSD-1-Clause
 URL:            https://sw.kovidgoyal.net/kitty
 Source0:        https://github.com/kovidgoyal/kitty/releases/download/v%{version}/%{name}-%{version}.tar.xz
 Source4:        https://github.com/kovidgoyal/kitty/releases/download/v%{version}/%{name}-%{version}.tar.xz.sig
@@ -140,6 +140,7 @@ Provides:       %{name}-fish-integration = %{version}-%{release}
 # machine.
 Requires:       %{name}-terminfo = %{version}-%{release}
 Requires:       %{name}-shell-integration = %{version}-%{release}
+Requires:       %{name}-kitten%{?_isa} = %{version}-%{release}
 
 # Very weak dependencies, these are required to enable all features of kitty's
 # "kittens" functions install separately
@@ -182,6 +183,7 @@ Suggests:       ImageMagick%{?_isa}
 # terminfo package
 %package        terminfo
 Summary:        The terminfo file for Kitty Terminal
+License:        GPL-3.0-only
 BuildArch:      noarch
 
 Requires:       ncurses-base
@@ -194,15 +196,27 @@ The terminfo file for Kitty Terminal.
 # shell-integration package
 %package        shell-integration
 Summary:        Shell integration scripts for %{name}
+License:        GPL-3.0-only AND MIT
 BuildArch:      noarch
 
+Recommends:     %{name}-kitten
+
 %description    shell-integration
 %{summary}.
 
+# kitten package
+%package        kitten
+Summary:        The kitten executable
+License:        GPL-3.0-only AND MIT AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND MPL-2.0 AND (BSD-2-Clause AND BSD-3-Clause)
+
+%description    kitten
+%{summary}.
+
 # doc package
 %if %{with doc}
 %package        doc
 Summary:        Documentation for %{name}
+License:        GPL-3.0-only AND MIT
 BuildArch:      noarch
 
 BuildRequires:  python3dist(sphinx)
@@ -233,9 +247,8 @@ find -type f -name "*.py" -exec sed -e 's|/usr/bin/env python3|%{__python3}|g'  
                                     -e 's|/usr/bin/env -S kitty|/usr/bin/kitty|g' \
                                     -i "{}" \;
 
-mkdir -p src/kitty
-ln -s ../../tools src/kitty/tools
-ln -s ../../kittens src/kitty/kittens
+mkdir src
+ln -s ../ src/kitty
 
 
 %build
@@ -308,7 +321,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 %endif
 %license LICENSE
 %{_bindir}/%{name}
-%{_bindir}/kitten
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*.{png,svg}
 %{_libdir}/%{name}/
@@ -318,6 +330,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 %endif
 %{_metainfodir}/*.xml
 
+%files kitten
+%license LICENSE
+%{_bindir}/kitten
+
 %files terminfo
 %license LICENSE
 %{_datadir}/terminfo/x/xterm-%{name}