diff --git a/ghex.changes b/ghex.changes
index c9a1135..aff1b1b 100644
--- a/ghex.changes
+++ b/ghex.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:26:28 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Wed Oct 12 13:14:53 UTC 2016 - zaitor@opensuse.org
 
diff --git a/ghex.spec b/ghex.spec
index 7e6c503..f5b1054 100644
--- a/ghex.spec
+++ b/ghex.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghex
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -20,12 +20,13 @@ Name:           ghex
 Version:        3.18.3
 Release:        0
 Summary:        GNOME Binary Editor
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Tools/Other
-Url:            http://www.gnome.org/
+URL:            http://www.gnome.org/
 Source:         http://download.gnome.org/sources/ghex/3.18/%{name}-%{version}.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  intltool
+BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
@@ -34,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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %glib2_gsettings_schema_requires
 
 %description
@@ -62,8 +62,9 @@ in either hex or ASCII. It is a must for anyone playing games that use
 a non-ASCII format for saving.
 
 %lang_package
+
 %prep
-%setup -n ghex-%{version}
+%setup -q -n ghex-%{version}
 translation-update-upstream
 
 %build
@@ -73,16 +74,13 @@ translation-update-upstream
 make %{?_smp_mflags}
 
 %install
-%makeinstall
-find %{buildroot}%{_libdir} -name "*.la" -type f -delete -print
-%suse_update_desktop_file -r %name GNOME Utility Editor
+%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}
 %find_lang %{name} ghex-3.0.lang %{?no_lang_C}
 %fdupes -s %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %post
 %if 0%{?suse_version} > 1130
 %desktop_database_post
@@ -98,12 +96,11 @@ rm -rf %{buildroot}
 %endif
 
 %post -n libgtkhex-3-0 -p /sbin/ldconfig
-
 %postun -n libgtkhex-3-0 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc README COPYING COPYING-DOCS AUTHORS
+%license COPYING
+%doc README COPYING-DOCS AUTHORS
 %{_bindir}/ghex
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/ghex.appdata.xml
@@ -121,11 +118,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/help/C/%{name}/
 
 %files -n libgtkhex-3-0
-%defattr(-,root,root)
 %{_libdir}/libgtkhex-3.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/gtkhex-3/
 %{_libdir}/libgtkhex-3.so
 %{_libdir}/pkgconfig/gtkhex-3.pc