diff --git a/.gitignore b/.gitignore
index c88cc4a..56991fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-/waffle-1.2.3.tar.xz
-/waffle-1.3.0.tar.xz
-/waffle-1.4.0.tar.xz
-/waffle-1.4.2.tar.xz
-/waffle-1.5.0.tar.xz
-/waffle-1.5.2.tar.xz
-/waffle-1.6.1.tar.xz
-/waffle-1.7.0.tar.bz2
-/waffle-1.8.0.tar.bz2
+/waffle-*.tar.xz
diff --git a/.packit.yaml b/.packit.yaml
new file mode 100644
index 0000000..8c4a334
--- /dev/null
+++ b/.packit.yaml
@@ -0,0 +1,19 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+specfile_path: waffle.spec
+
+copy_upstream_release_description: false
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+
+  - job: koji_build
+    trigger: commit
+    allowed_committers: ['packit','all_admins']
+    dist_git_branches:
+      - fedora-rawhide
+
diff --git a/sources b/sources
index fc34d62..bf7ea39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waffle-1.8.0.tar.bz2) = 1a78f0e9864bc99fdd0452f65632b5d0c4ed42b99ec6c8b6551c66c018b4effe53ee8bad00cfdd538b5e2250ea02097944e7581592ff6472ff6de8abadd80160
+SHA512 (waffle-1.8.3.tar.xz) = 6c320e3bab223075da8c4b1a32a24ad857143481f58ab1a39c4e6ace869c5e802cd768cd6186b28abe47c273994188be2b943e5c9fa156941dc5695316859d05
diff --git a/waffle.spec b/waffle.spec
index 236396c..0201ab9 100644
--- a/waffle.spec
+++ b/waffle.spec
@@ -1,27 +1,27 @@
 Name:          waffle
-Version:       1.8.0
+Version:       1.8.3
 Release:       %autorelease
 Summary:       Platform independent GL API layer
 
 License:       MIT
 URL:           http://www.waffle-gl.org/releases.html
-Source0:       https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.bz2
+Source0:       https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.xz
 
-Patch0:        0001-wayland-fix-build-against-version-1.20.patch
-Patch1:        fix-bash.patch
-
-BuildRequires: cmake libxslt docbook-style-xsl libxcb-devel
-BuildRequires: gcc-c++
-BuildRequires: libX11-devel mesa-libGL-devel mesa-libGLU-devel
-BuildRequires: chrpath
-BuildRequires: mesa-libEGL-devel
-%if 0%{?rhel} > 6 || 0%{?fedora} > 0
-BuildRequires: mesa-libGLES-devel
-BuildRequires: systemd-devel
-%endif
-BuildRequires: mesa-libgbm-devel
-BuildRequires: wayland-devel
-BuildRequires: wayland-protocols-devel
+BuildRequires:  cmake
+BuildRequires:  docbook-style-xsl
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  libX11-devel
+BuildRequires:  libxcb-devel
+BuildRequires:  libxslt
+BuildRequires:  mesa-libEGL-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLES-devel
+BuildRequires:  mesa-libgbm-devel
+BuildRequires:  meson
+BuildRequires:  ninja-build
+BuildRequires:  wayland-devel
+BuildRequires:  wayland-protocols-devel
 
 %description
 Waffle is a cross-platform C library that allows one to defer
@@ -42,7 +42,7 @@ Requires:   %{name}%{?_isa} = %{version}-%{release}
 
 %description doc
 Contains HTML version of the developer documentation for development of
-%{name}-related software (manpages are in the -devel package).
+%{name}-related software (man pages are in the -devel package).
 
 
 %package examples
@@ -54,48 +54,46 @@ Example programs using %{name}.
 
 
 %prep
-%autosetup -n waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300 -p1
+%autosetup -p1
+ln -sf waffle-1.5.0.txt doc/release-notes/waffle-1.5.0-rc2.txt
 
 
 %build
-%cmake \
-    -DCMAKE_INSTALL_DOCDIR:PATH=%{_defaultdocdir}/%{name}-%{version} \
-    -DCMAKE_BUILD_STRIP=FALSE \
-    -Dwaffle_has_glx=1 -Dwaffle_has_gbm=1 \
-    -Dwaffle_has_wayland=1 \
-    -Dwaffle_build_manpages=1 -Dwaffle_build_htmldocs=1
+%meson -Dbuild-manpages=true
+%meson_build
 
-%cmake_build
-
-# We don’t want to install binary files in %%docdir
-rm -rf examples/CMakeFiles
 
 %install
-%cmake_install
-# Fedora now uses unversioned doc dirs, make install shouldn’t try to
+%meson_install
+# Fedora now uses unversioned doc dirs, make install shouldn't try to
 # install there anyway.
 rm -rf %{buildroot}%{_docdir}/%{name}*
 
-%ldconfig_scriptlets
+
+%check
+%meson_test
 
 
 %files
 %license LICENSE.txt
 %doc README.md
-%{_libdir}/lib%{name}*.so.*
 %{_bindir}/wflinfo
+%{_libdir}/lib%{name}-1.so.0*
 %{_datadir}/bash-completion/completions/wflinfo
+%{_datadir}/zsh/site-functions/_wflinfo
+%{_mandir}/man1/wflinfo.1*
 
 %files doc
 %doc doc/html/
 
 %files devel
 %doc doc/release-notes/
-%{_includedir}/waffle*
-%{_libdir}/lib%{name}*.so
-%{_libdir}/pkgconfig/%{name}*
-%{_libdir}/cmake/Waffle/*
-%{_mandir}/man*/*
+%{_includedir}/waffle-1/
+%{_libdir}/lib%{name}-1.so
+%{_libdir}/pkgconfig/%{name}-1.pc
+%{_libdir}/cmake/Waffle/
+%{_mandir}/man3/waffle*.3*
+%{_mandir}/man7/waffle*.7*
 
 
 %files examples