diff --git a/elfutils-debuginfod.changes b/elfutils-debuginfod.changes
index 630d678..e6121cb 100644
--- a/elfutils-debuginfod.changes
+++ b/elfutils-debuginfod.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  9 15:31:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- align patches section
+- remove date/time handling weirdness, elfutils does no longer
+  use __DATE__ or __TIME__ (as proven by the newly added -Werror=date-time) 
+
 -------------------------------------------------------------------
 Mon Nov  7 08:38:51 UTC 2022 - Martin Liška <mliska@suse.cz>
 
diff --git a/elfutils-debuginfod.spec b/elfutils-debuginfod.spec
index 54fc42b..b6f423c 100644
--- a/elfutils-debuginfod.spec
+++ b/elfutils-debuginfod.spec
@@ -26,10 +26,10 @@ URL:            https://sourceware.org/elfutils/
 #Git-Clone:	git://sourceware.org/git/elfutils
 Source:         https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfutils-%{version}.tar.bz2
 Source1:        https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfutils-%{version}.tar.bz2.sig
-Source2:        elfutils.changes
 Source3:        elfutils.keyring
 Source4:        %{name}.sysusers
 Patch1:         harden_debuginfod.service.patch
+Patch2:         0005-backends-Add-RISC-V-object-attribute-printing.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -114,17 +114,7 @@ URL for a distribution.
 
 %build
 %sysusers_generate_pre %{SOURCE4} %{name} %{name}.conf
-# Change DATE/TIME macros to use last change time of elfutils.changes
-# See http://lists.opensuse.org/opensuse-factory/2011-05/msg00304.html
-modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
-DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
-TIME="\"$(date -d "${modified}" "+%%R")\""
-find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
-# Set modversion used to verify dynamically loaded ebl backend matches to
-# similarly predictable value [upstream default is hostname + date]
-MODVERSION="suse-build `eval echo ${DATE} ${TIME}`"
-sed --in-place "s/^MODVERSION=.*\$/MODVERSION=\"${MODVERSION}\"/" configure.ac
-export CFLAGS="%optflags"
+export CFLAGS="%optflags -Werror=date-time"
 CFLAGS+=" -g" # tests need debug info enabled (boo#1031556)
 %ifarch %sparc
 # Small PIC model not sufficient
diff --git a/elfutils.changes b/elfutils.changes
index a396f56..52c2276 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  9 15:31:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- align patches section
+- remove date/time handling weirdness, elfutils does no longer
+  use __DATE__ or __TIME__ (as proven by the newly added -Werror=date-time) 
+
 -------------------------------------------------------------------
 Mon Nov  7 08:38:51 UTC 2022 - Martin Liška <mliska@suse.cz>
 
diff --git a/elfutils.spec b/elfutils.spec
index 969f23f..460edf3 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -27,10 +27,11 @@ URL:            https://sourceware.org/elfutils/
 Source:         https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:        README-BEFORE-ADDING-PATCHES
 Source2:        baselibs.conf
-Source3:        %{name}.changes
 Source4:        https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name}-%{version}.tar.bz2.sig
 Source5:        %{name}.keyring
 Source6:        elfutils-rpmlintrc
+Patch1:         harden_debuginfod.service.patch
+Patch2:         0005-backends-Add-RISC-V-object-attribute-printing.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -40,8 +41,6 @@ BuildRequires:  libzstd-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 
-Patch24304:     0005-backends-Add-RISC-V-object-attribute-printing.patch
-
 %description
 elfutils is a collection of utilities and libraries to read, create
 and modify ELF binary files, find and handle DWARF debug data,
@@ -151,17 +150,7 @@ The package is dummy.
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-# Change DATE/TIME macros to use last change time of elfutils.changes
-# See http://lists.opensuse.org/opensuse-factory/2011-05/msg00304.html
-modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
-DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
-TIME="\"$(date -d "${modified}" "+%%R")\""
-find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
-# Set modversion used to verify dynamically loaded ebl backend matches to
-# similarly predictable value [upstream default is hostname + date]
-MODVERSION="suse-build `eval echo ${DATE} ${TIME}`"
-sed --in-place "s/^MODVERSION=.*\$/MODVERSION=\"${MODVERSION}\"/" configure.ac
-export CFLAGS="%optflags"
+export CFLAGS="%optflags -Werror=date-time"
 CFLAGS+=" -g" # tests need debug info enabled (boo#1031556)
 %ifarch %sparc
 # Small PIC model not sufficient