diff --git a/asusctl.spec b/asusctl.spec
index 1254fb0..81c870d 100644
--- a/asusctl.spec
+++ b/asusctl.spec
@@ -4,14 +4,15 @@
 
 # Use hardening ldflags.
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
+
+Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 Name:           asusctl
 Version:        4.5.8
 Release:        1
-Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 License:        MPLv2
 Group:          System/Kernel and hardware
 URL:            https://gitlab.com/asus-linux/asusctl
-Source:         %{name}-%{version}.tar.gz
+Source0:         %{name}-%{version}.tar.gz
 Source1:        vendor_%{name}_%{version}.tar.xz
 Source2:        cargo_config
 BuildRequires:  cargo
@@ -36,40 +37,6 @@ It provides an interface for rootless control of some system functions such as
 fan speeds, keyboard LEDs, battery charge level, and graphics modes.
 asus-nb-ctrl enables third-party apps to use the above with dbus methods.
 
-%package rog-gui
-Summary: An experimental GUI for %{name}
-Requires: %{name}
-
-%description rog-gui
-A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls,
-a notification service, and ability to run in the background.
-
-%prep
-%autosetup
-%setup -D -T -a 1
-
-mv Cargo.lock{,.bak}
-%cargo_prep
-mv Cargo.lock{.bak,}
-sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
-cat %{SOURCE2} >> .cargo/config
-
-%build
-export RUSTFLAGS="%{rustflags}"
-%cargo_build
-#cargo build --release --frozen --offline --config .cargo/config.toml
-
-%install
-export RUSTFLAGS="%{rustflags}"
-mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
-%make_install
- 
-install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
-install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
-install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png
-
-desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop
-
 %files
 %license LICENSE
 %{_bindir}/asusd
@@ -96,9 +63,46 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.d
 %{_docdir}/%{name}/
 %{_datadir}/asusd/
 
+#-----------------------------------------------------------------------
+
+%package rog-gui
+Summary: An experimental GUI for %{name}
+Requires: %{name}
+
+%description rog-gui
+A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls,
+a notification service, and ability to run in the background.
+
 %files rog-gui
 %{_bindir}/rog-control-center
 %{_datadir}/applications/rog-control-center.desktop
 %{_datadir}/icons/hicolor/512x512/apps/rog-control-center.png
 %{_datadir}/rog-gui
 
+#-----------------------------------------------------------------------
+
+%prep
+%autosetup
+%setup -D -T -a 1
+
+mv Cargo.lock{,.bak}
+%cargo_prep
+mv Cargo.lock{.bak,}
+sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
+cat %{SOURCE2} >> .cargo/config
+
+%build
+export RUSTFLAGS="%{rustflags}"
+%cargo_build
+#cargo build --release --frozen --offline --config .cargo/config.toml
+
+%install
+export RUSTFLAGS="%{rustflags}"
+mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
+%make_install
+ 
+install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
+install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
+install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop