diff --git a/claws-mail.spec b/claws-mail.spec
index 499f02c..b4ec3c1 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -11,7 +11,7 @@
 Summary:	The user-friendly, lightweight and fast GTK2 based email client
 Name:		claws-mail
 Version:	3.8.1
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPLv3+
 Group:		%{Group}
@@ -56,9 +56,6 @@ Requires:	aspell-dictionary
 Obsoletes:	%{name}-tools < %{EVRD}
 Provides:	%{name}-tools
 Obsoletes:	%{name}-spamassassin-plugin < %{EVRD}
-# Fix upgrade from mdk 2006:
-Obsoletes:	sylpheed-claws2
-Obsoletes:	sylpheed-claws
 #Clamav is dropped
 Obsoletes:	claws-mail-clamav-plugin < %{EVRD}
 #Pdf Viever is gone
@@ -114,8 +111,6 @@ Summary:	Development files for %{name}
 Group:		Development/Other
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	aspell-dictionary
-Obsoletes:	sylpheed-claws2-devel
-Obsoletes:	sylpheed-claws-devel
 
 %description -n %{name}-devel
 Development files and headers for %{name}.
@@ -137,7 +132,7 @@ less spam.
 %package smime-plugin
 Summary:	S/Mime plugin for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
 
 %description smime-plugin
 This plugin allows to use S/Mime signatures and encryptions in Claws Mail.
@@ -145,10 +140,10 @@ This plugin allows to use S/Mime signatures and encryptions in Claws Mail.
 %package dillo_viewer-plugin
 Summary:	Dillo HTML viewer plugin for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
 Requires:	dillo
 Provides:	sylpheed-claws2-dillo_viewer-plugin
-Obsoletes:	sylpheed-claws2-dillo_viewer-plugin < %{epoch}:%{version}-%{release}
+Obsoletes:	sylpheed-claws2-dillo_viewer-plugin < %{EVRD}
 
 %description dillo_viewer-plugin
 This plugin uses the Dillo browser to view text/html MIME parts inside %{name}.
@@ -156,7 +151,7 @@ This plugin uses the Dillo browser to view text/html MIME parts inside %{name}.
 %package pgpcore-plugin
 Summary:	PGP core plugin for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
 Provides:	sylpheed-claws2-pgpcore-plugin
 Obsoletes:	sylpheed-claws2-pgpcore-plugin < %{epoch}:%{version}-%{release}
 
@@ -167,10 +162,10 @@ PGP/MIME plugins.
 %package pgpinline-plugin
 Summary:	PGP/Inline plugin for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-pgpcore-plugin = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
+Requires:	%{name}-pgpcore-plugin = %{EVRD}
 Provides:	sylpheed-claws2-pgpinline-plugin
-Obsoletes:	sylpheed-claws2-pgpinline-plugin < %{epoch}:%{version}-%{release}
+Obsoletes:	sylpheed-claws2-pgpinline-plugin < %{EVRD}
 
 %description pgpinline-plugin
 Handles PGP/Inline signed and/or encrypted mails. You can decrypt mails,
@@ -179,10 +174,10 @@ verify signatures or sign and encrypt your own mails.
 %package pgpmime-plugin
 Summary:	PGP/MIME plugin for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-pgpcore-plugin = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
+Requires:	%{name}-pgpcore-plugin = %{EVRD}
 Provides:	sylpheed-claws2-pgpmime-plugin
-Obsoletes:	sylpheed-claws2-pgpmime-plugin < %{epoch}:%{version}-%{release}
+Obsoletes:	sylpheed-claws2-pgpmime-plugin < %{EVRD}
 
 %description pgpmime-plugin
 Handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify
@@ -191,10 +186,10 @@ signatures or sign and encrypt your own mails.
 %package spamassassin-plugin
 Summary:	Spamassassin-plugin for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
 Requires:	spamassassin-spamd
 Provides:	sylpheed-claws2-spamassassin-plugin
-Obsoletes:	sylpheed-claws2-spamassassin-plugin < %{epoch}:%{version}-%{release}
+Obsoletes:	sylpheed-claws2-spamassassin-plugin < %{EVRD}
 
 %description spamassassin-plugin
 Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL
@@ -203,9 +198,9 @@ account using SpamAssassin. See README for configuration and set-up info.
 %package trayicon-plugin
 Summary:	Notafication icon for %{name}
 Group:		%{Group}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{EVRD}
 Provides:	sylpheed-claws2-trayicon-plugin
-Obsoletes:	sylpheed-claws2-trayicon-plugin < %{epoch}:%{version}-%{release}
+Obsoletes:	sylpheed-claws2-trayicon-plugin < %{EVRD}
 
 %description trayicon-plugin
 Places an icon in the system tray that indicates whether you have any new mail.