diff --git a/musepack.changes b/musepack.changes
index 4933fe2..5937a8a 100644
--- a/musepack.changes
+++ b/musepack.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jul  4 10:42:03 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- More spec file cleanup:
+  * Use SPDX identifiers for License
+  * Correct license for libmpcdec (BSD-3-clause)
+  * Use https:// for Source and Url
+  * Remove __DATE__/__TIME__ mangling, no longer needed with current GCC
+  * Remove BuildRoot
+
 -------------------------------------------------------------------
 Fri Jun 21 20:11:03 UTC 2019 - mgorse@suse.com
 
diff --git a/musepack.spec b/musepack.spec
index 74b6953..87e0755 100644
--- a/musepack.spec
+++ b/musepack.spec
@@ -2,6 +2,7 @@
 # spec file for package musepack
 #
 # Copyright (c) 2013 Asterios Dramis <asterios.dramis@gmail.com>.
+# 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,23 +13,26 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
 
 %define so_ver 6
 
 Name:           musepack
 Version:        r475
 Release:        0
-License:        BSD-3-Clause and LGPL-2.1+ and GPL-2.0+ and Zlib
+# libmpcdec: BSD, libmpcenc/libmpcpsy: LGPL, tools: GPL, huffman coding: Zlib
+License:        BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later AND Zlib
 Summary:        Audio Compression Format
-Url:            http://www.musepack.net/
+Url:            https://www.musepack.net/
 Group:          Productivity/Multimedia/Other
-Source0:        http://files.musepack.net/source/%{name}_src_%{version}.tar.gz
+Source0:        https://files.musepack.net/source/%{name}_src_%{version}.tar.gz
 # PATCH-FIX-UPSTREAM libmpcdec.patch asterios.dramis@gmail.com -- Fix CMakeLists.txt to install a libmpcdec shared library, fix missing libmpcdec link to libm
 Patch0:         libmpcdec.patch
 BuildRequires:  cmake
 BuildRequires:  libcuefile-devel
 BuildRequires:  libreplaygain-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Musepack is an audio compression format with a strong emphasis on high quality.
@@ -51,6 +55,7 @@ This package includes development files for musepack.
 
 %package -n libmpcdec%{so_ver}
 Summary:        Audio Compression Format
+License:        BSD-3-Clause AND Zlib
 Group:          System/Libraries
 
 %description -n libmpcdec%{so_ver}
@@ -68,12 +73,6 @@ optimized and patentless code.
 %patch0
 
 %build
-# Remove build time references so build-compare can do its work
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" mpc2sv8/mpc2sv8.c mpcchap/mpcchap.c mpccut/mpccut.c mpcdec/mpcdec.c mpcenc/mpcenc.c mpcgain/mpcgain.c
-sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" mpc2sv8/mpc2sv8.c mpcchap/mpcchap.c mpccut/mpccut.c mpcdec/mpcdec.c mpcenc/mpcenc.c mpcgain/mpcgain.c
-
 # Fix rpmlint warning "version-control-internal-file"
 rm -rf include/mpc/.svn/
 
@@ -84,7 +83,7 @@ chmod 644 libmpcdec/AUTHORS libmpcdec/COPYING libmpcdec/ChangeLog
 sed -i "s/set(CMAKE_C_FLAGS.*$//" CMakeLists.txt
 
 %cmake
-make %{?_smp_mflags} VERBOSE=1
+%cmake_build
 
 %install
 %cmake_install
@@ -97,7 +96,8 @@ make %{?_smp_mflags} VERBOSE=1
 %{_bindir}/*
 
 %files devel
-%doc libmpcdec/AUTHORS libmpcdec/COPYING libmpcdec/ChangeLog
+%license libmpcdec/COPYING
+%doc libmpcdec/AUTHORS libmpcdec/ChangeLog
 %{_includedir}/mpc/
 %{_libdir}/libmpcdec.so