diff --git a/.gitignore b/.gitignore
index 16a16e6..1b8cb7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ devhelp-2.90.5.tar.bz2
 /devhelp-3.27.90.tar.xz
 /devhelp-3.28.0.tar.xz
 /devhelp-3.28.1.tar.xz
+/devhelp-3.30.0.tar.xz
diff --git a/devhelp.spec b/devhelp.spec
index 48746ad..bf42ca6 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,18 +1,21 @@
 Name: devhelp
 Epoch: 1
-Version: 3.28.1
-Release: 2%{?dist}
+Version: 3.30.0
+Release: 1%{?dist}
 Summary: API documentation browser
 
 License: GPLv2+
 URL: https://wiki.gnome.org/Apps/Devhelp
-Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 BuildRequires: chrpath
-BuildRequires: desktop-file-utils >= 0.3
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gobject-introspection-devel
+BuildRequires: gtk-doc
 BuildRequires: itstool
+BuildRequires: meson
+BuildRequires: pkgconfig(amtk-5)
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(webkit2gtk-4.0)
@@ -43,11 +46,11 @@ for embedding devhelp into other applications such as IDEs.
 %setup -q
 
 %build
-%configure --disable-static --disable-Werror
-make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
+%meson -Dgtk_doc=true
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 # Update the screenshot shown in the software center
 #
@@ -58,8 +61,6 @@ make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
 appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml \
   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/devhelp/a.png 
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
 
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/devhelp
@@ -68,7 +69,6 @@ rm -rf ${RPM_BUILD_ROOT}%{_libdir}/gedit/plugins/__pycache__
 
 %find_lang devhelp --with-gnome
 
-
 %check
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.desktop
@@ -84,13 +84,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.
 %{_datadir}/applications/org.gnome.Devhelp.desktop
 %{_datadir}/dbus-1/services/org.gnome.Devhelp.service
 %{_datadir}/devhelp
-%{_datadir}/icons/hicolor/16x16/apps/devhelp.png
-%{_datadir}/icons/hicolor/22x22/apps/devhelp.png
-%{_datadir}/icons/hicolor/24x24/apps/devhelp.png
-%{_datadir}/icons/hicolor/32x32/apps/devhelp.png
-%{_datadir}/icons/hicolor/48x48/apps/devhelp.png
-%{_datadir}/icons/hicolor/256x256/apps/devhelp.png
-%{_datadir}/icons/hicolor/symbolic/apps/devhelp-symbolic.svg
+%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/org.gnome.Devhelp.png
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Devhelp-symbolic.svg
 %{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
 
 %dir %{_libdir}/gedit
@@ -99,18 +95,22 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.
 %{_mandir}/man1/devhelp.1*
 
 %files libs -f devhelp.lang
-%{_libdir}/libdevhelp-3.so.5*
+%{_libdir}/libdevhelp-3.so.6*
 %{_libdir}/girepository-1.0/Devhelp-3.0.typelib
-%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.libdevhelp-3.gschema.xml
 
 %files devel
-%{_includedir}/devhelp-3.0/
+%{_includedir}/devhelp-3/
 %{_libdir}/libdevhelp-3.so
 %{_libdir}/pkgconfig/*
 %{_datadir}/gtk-doc/*
 %{_datadir}/gir-1.0/Devhelp-3.0.gir
 
 %changelog
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1:3.30.0-1
+- Update to 3.30.0
+- Switch to the meson build system
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.28.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 0884c62..cad3819 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (devhelp-3.28.1.tar.xz) = a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
+SHA512 (devhelp-3.30.0.tar.xz) = 75ace4383d61416b72f9e7ad0032e0a30391075cdfd4262c11dc1e810a73f31a91fedadc06639404b27b5feeae5e6d9ddd9d7db82955fa232e9ca38bb2b960b3