diff --git a/debian.control b/debian.control
index 84bf8ec..25b571f 100644
--- a/debian.control
+++ b/debian.control
@@ -5,7 +5,7 @@ Maintainer: openSUSE <opensuse@opensuse.org>
 Standards-Version: 4.5.0
 Build-Depends: debhelper-compat (= 12)
 
-Package: libvmime-suse5
+Package: libvmime-suse6
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Library for working with MIME messages and IMAP/POP/SMTP
@@ -13,7 +13,7 @@ Description: Library for working with MIME messages and IMAP/POP/SMTP
 
 Package: libvmime-dev
 Architecture: any
-Depends: ${misc:Depends}, libvmime-suse5 (= ${binary:Version}),
+Depends: ${misc:Depends}, libvmime-suse6 (= ${binary:Version}),
  libgsasl-dev | libgsasl7-dev, libgnutls28-dev
 Description: Development files for vmime, an e-mail message library
  .
diff --git a/debian.rules b/debian.rules
index 34f3422..bc03ae1 100644
--- a/debian.rules
+++ b/debian.rules
@@ -9,7 +9,7 @@ override_dh_auto_configure:
 	cmake \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 		-DCMAKE_INSTALL_LIBDIR:PATH="/usr/lib/${DEB_HOST_MULTIARCH}" \
-		-DVMIME_SENDMAIL_PATH:STRING="/usr/sbin/sendmail"
+		-DVMIME_SENDMAIL_PATH:STRING="/usr/sbin/sendmail" \
 		-DVMIME_BUILD_SAMPLES:BOOL=OFF \
 		-DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \
 		-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
diff --git a/libvmime.changes b/libvmime.changes
index 1e1af17..e94b103 100644
--- a/libvmime.changes
+++ b/libvmime.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 25 23:52:52 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Reinstate %optflags
+
 -------------------------------------------------------------------
 Sun Dec 31 16:19:00 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/libvmime.spec b/libvmime.spec
index 13567a4..a8a8087 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -31,7 +31,7 @@ Patch1:         libvmime-nodatetime.diff
 Patch2:         libvmime-soname.diff
 BuildRequires:  cmake >= 2.8.3
 BuildRequires:  gcc-c++
-%if 0%{?centos_version}
+%if 0%{?rhel} || 0%{?fedora_version}
 BuildRequires:  gnutls-devel
 %else
 BuildRequires:  libgnutls-devel
@@ -112,10 +112,10 @@ popd
 	-DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \
 	-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
-	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$cf" \
-	-DCMAKE_CXX_FLAGS:STRING="%{?redhat_version:-fPIC} %{?almalinux_version:-fPIC}" \
-	-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$cf" \
-	-DCMAKE_C_FLAGS:STRING="%{?redhat_version:-fPIC} %{?almalinux_version:-fPIC}" \
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags" \
+	-DCMAKE_CXX_FLAGS:STRING="%optflags" \
+	-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \
+	-DCMAKE_C_FLAGS:STRING="%optflags" \
 	-DVMIME_BUILD_DOCUMENTATION:BOOL=OFF
 %cmake_build
 
@@ -127,8 +127,6 @@ cp -a doc/book/book.pdf "$b/%_docdir/%name/"
 %endif
 %cmake_install
 find "$b" -type f -name "*.la" -delete
-mkdir -p "$b/%_datadir"
-#mv "$b/%_prefix/cmake" "$b/%_datadir/"
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig