diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73178e2..098aab0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,17 +8,11 @@ variables:
 before_script:
 - dnf install -y $DEPS_COMMON
 
-fedora-autotools:
-  script:
-    # Run with default options
-    - ./autogen.sh
-    - make
-    - make distcheck
-    - rpmlint -o "NetworkEnabled False" spice-protocol.spec
-    - rpmbuild -ta spice-protocol-*.tar.bz2
-
-fedora-meson:
+fedora:
   script:
     - meson --buildtype=release build-default
     - ninja -C build-default
     - ninja -C build-default dist
+    - rpmlint -o "NetworkEnabled False" build-default/spice-protocol.spec
+    - mkdir -p ~/rpmbuild/SOURCES && cp build-default/meson-dist/spice-protocol*.tar.xz ~/rpmbuild/SOURCES/
+    - rpmbuild -ba build-default/spice-protocol.spec
diff --git a/spice-protocol.spec.in b/spice-protocol.spec.in
index 49724c6..300b576 100644
--- a/spice-protocol.spec.in
+++ b/spice-protocol.spec.in
@@ -6,7 +6,7 @@ Group:          Development/Libraries
 # Main headers are BSD, controller / foreign menu are LGPL
 License:        BSD and LGPLv2+
 URL:            https://www.spice-space.org
-Source0:        https://www.spice-space.org/download/releases/%{name}-%{version}.tar.bz2
+Source0:        https://www.spice-space.org/download/releases/%{name}-%{version}.tar.xz
 BuildArch:      noarch
 
 %description
@@ -18,11 +18,11 @@ and the para-virtual graphics card QXL.
 %setup -q
 
 %build
-%configure
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-make DESTDIR=%{buildroot} install
+%meson_install
 
 
 %files