diff --git a/ghex-3.18.3.tar.xz b/ghex-3.18.3.tar.xz
deleted file mode 100644
index e327d61..0000000
--- a/ghex-3.18.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3
-size 1630720
diff --git a/ghex-3.18.4.tar.xz b/ghex-3.18.4.tar.xz
new file mode 100644
index 0000000..782a1e9
--- /dev/null
+++ b/ghex-3.18.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0
+size 1420268
diff --git a/ghex.changes b/ghex.changes
index aff1b1b..e084af3 100644
--- a/ghex.changes
+++ b/ghex.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sat Jul 13 16:35:55 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.18.4:
+  + Distribute extra empty space between offsets and xdisp.
+  + Improve border with calculations.
+  + Migrate build system to meson.
+  + Add OARS metadata.
+  + Update various links after bugzilla to gitlab migration.
+  + Rename icons, appstream and desktop files to consistently use
+    org.gnome.GHex ID.
+  + Add flatpak manifest for nightly builds, enable nightly builds
+    in CI.
+  + Install appstream metadata to non-deprecated location.
+  + Various updates to help docs.
+  + Updated translations.
+- Switch to meson buildsystem following upstreams port: Add meson
+  BuildRequires and macros.
+- Drop now obsolete intltool, translation-update-upstream
+  BuildRequires and glib2_gsettings_schema_requires macro and
+  conditional calling of desktop_database_post(un),
+  icon_theme_cache_post(un) and glib2_gsettings_schema_post(un) in
+  post(un).
+
 -------------------------------------------------------------------
 Wed Feb 28 16:26:28 UTC 2018 - dimstar@opensuse.org
 
diff --git a/ghex.spec b/ghex.spec
index f5b1054..a6df12e 100644
--- a/ghex.spec
+++ b/ghex.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghex
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,22 +12,22 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           ghex
-Version:        3.18.3
+Version:        3.18.4
 Release:        0
 Summary:        GNOME Binary Editor
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Other
 URL:            http://www.gnome.org/
 Source:         http://download.gnome.org/sources/ghex/3.18/%{name}-%{version}.tar.xz
+
 BuildRequires:  fdupes
-BuildRequires:  intltool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
-BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(atk) >= 1.0.0
@@ -35,7 +35,6 @@ BuildRequires:  pkgconfig(gail-3.0)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.31.10
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.3.8
 Recommends:     %{name}-lang
-%glib2_gsettings_schema_requires
 
 %description
 GHex allows the user to load data from any file and to view and edit it
@@ -64,58 +63,31 @@ a non-ASCII format for saving.
 %lang_package
 
 %prep
-%setup -q -n ghex-%{version}
-translation-update-upstream
+%autosetup -p1
 
 %build
-%configure --with-pic\
-	--disable-static\
-	--disable-scrollkeeper
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-%suse_update_desktop_file -r %{name} GNOME Utility Editor
-%find_lang %{name}-3.0 %{?no_lang_C}
+%meson_install
+
+%suse_update_desktop_file -r org.gnome.GHex GNOME Utility Editor
 %find_lang %{name} ghex-3.0.lang %{?no_lang_C}
 %fdupes -s %{buildroot}
 
-%post
-%if 0%{?suse_version} > 1130
-%desktop_database_post
-%icon_theme_cache_post
-%glib2_gsettings_schema_post
-%endif
-
-%postun
-%if 0%{?suse_version} > 1130
-%desktop_database_postun
-%icon_theme_cache_postun
-%glib2_gsettings_schema_postun
-%endif
-
 %post -n libgtkhex-3-0 -p /sbin/ldconfig
 %postun -n libgtkhex-3-0 -p /sbin/ldconfig
 
 %files
 %license COPYING
 %doc README COPYING-DOCS AUTHORS
-%{_bindir}/ghex
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/ghex.appdata.xml
-%{_datadir}/applications/ghex.desktop
-%dir %{_datadir}/GConf
-%dir %{_datadir}/GConf/gsettings
-%{_datadir}/GConf/gsettings/ghex.convert
-%{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml
-# Own dirs for older versions of openSUSE
-%if 0%{?suse_version} <= 1320
-%dir %{_datadir}/icons/hicolor/512x512
-%dir %{_datadir}/icons/hicolor/512x512/apps
-%endif
-%{_datadir}/icons/hicolor/*/apps/ghex*
 %doc %{_datadir}/help/C/%{name}/
+%{_bindir}/ghex
+%{_datadir}/metainfo/org.gnome.GHex.appdata.xml
+%{_datadir}/applications/org.gnome.GHex.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.GHex.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/org.gnome.GHex*
 
 %files -n libgtkhex-3-0
 %{_libdir}/libgtkhex-3.so.*