diff --git a/xpinguin.changes b/xpinguin.changes
index 96dc662..eb84fc8 100644
--- a/xpinguin.changes
+++ b/xpinguin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 15 08:14:49 UTC 2021 - Martin Pluskal <mpluskal@suse.com>
+
+- Enforce usage of optflags
+- Modernise spec file
+
 -------------------------------------------------------------------
 Mon Feb 19 20:31:37 UTC 2018 - crrodriguez@opensuse.org
 
diff --git a/xpinguin.spec b/xpinguin.spec
index 0efa438..5790337 100644
--- a/xpinguin.spec
+++ b/xpinguin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xpinguin
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,58 +12,46 @@
 # 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:           xpinguin
+Version:        1.0.2
+Release:        0
+Summary:        The 'Logo' of Linux 2.0
+License:        GPL-2.0-or-later
+Group:          Amusements/Toys/Graphics
+Source:         xpinguin.tar.gz
+Source1:        xpinguin.png
+Source2:        xpinguin.desktop
 BuildRequires:  imake
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xpm)
-Summary:        The 'Logo' of Linux 2.0
-License:        GPL-2.0+
-Group:          Amusements/Toys/Graphics
-Version:        1.0.2
-Release:        0
-Source:         xpinguin.tar.gz
-Source1:        xpinguin.png
-Source2:        xpinguin.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Based on xteddy -- really cute ;-)
 
-
-
-Authors:
---------
-    Stefan Gustavson <stefang@isy.liu.se>
-    Jens Poenisch <J.Poenisch@wirtschaft.tu-chemnitz.de>
-
 %prep
-%setup -n xpinguin
+%autosetup -n xpinguin
 ln -s xpinguin.1 xpinguin.man
 xmkmf -a
 
 %build
-make
+%make_build CC="cc %{optflags}"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install install.man
-rm -f   $RPM_BUILD_ROOT/usr/X11R6/man/man1/xpinguin.1x.gz
+%make_install install.man
+rm -f   %{buildroot}%{_prefix}/X11R6/man/man1/xpinguin.1x.gz
 %suse_update_desktop_file -i xpinguin Amusement
 
-%clean 
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root)
-%_bindir/xpinguin
-%_mandir/man1/xpinguin.1x.gz
-/usr/share/applications/xpinguin.desktop
-/usr/share/pixmaps/xpinguin.png
+%{_bindir}/xpinguin
+%{_mandir}/man1/xpinguin.1x.gz
+%{_datadir}/applications/xpinguin.desktop
+%{_datadir}/pixmaps/xpinguin.png
 
 %changelog