diff --git a/exim.changes b/exim.changes
index fcb393c..b909df0 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,11 @@
+Wed Jun  5 07:14:44 CEST 2019 - wullinger@rz.uni-kiel.de
+
+- spec file cleanup
+ * fix DANE inclusion guard condition
+ * re-enable i18n and remove misleading comment
+ * EXPERIMENTAL_SPF is now SUPPORT_SPF
+ * DANE is now SUPPORT_DANE
+
 -------------------------------------------------------------------
 Sat Mar 23 05:03:11 UTC 2019 - seanlew@opensuse.org 
 
diff --git a/exim.spec b/exim.spec
index 593485a..2eb0e43 100644
--- a/exim.spec
+++ b/exim.spec
@@ -25,14 +25,13 @@
 %bcond_without  pgsql
 %bcond_without  sqlite
 %bcond_without  ldap
-%if 0%{?suse_version} < 1199 || 0%{?centos_version} < 599 || 0%{?rhel_version} < 599
-%bcond_with    dane
+%bcond_without  i18n
+
+%if 0%{?suse_version} > 1199 || 0%{?centos_version} > 599 || 0%{?rhel_version} > 599
+%bcond_without  dane
 %else
-%bcond_without dane
+%bcond_with     dane
 %endif
-# disable for now,
-# since utf8_downconvert currently crashes
-%bcond_without i18n
 
 Name:           exim
 BuildRequires:  cyrus-sasl-devel
@@ -272,7 +271,7 @@ cat <<-EOF > Local/Makefile
 	# SPOOL_MODE=0640
 	SUPPORT_MOVE_FROZEN_MESSAGES=yes
 	HAVE_IPV6=YES
-	EXPERIMENTAL_SPF=yes
+    SUPPORT_SPF=yes
 	LOOKUP_LIBS+=-lspf2
     #EXPERIMENTAL_DMARC=yes
 	#CFLAGS += -I/usr/local/include
@@ -283,7 +282,7 @@ cat <<-EOF > Local/Makefile
 	EXPERIMENTAL_DSN=yes
 	SYSTEM_ALIASES_FILE=/etc/aliases
 %if %{with dane}
-	DANE=yes
+    SUPPORT_DANE=yes
 %endif
 	EXPERIMENTAL_SOCKS=yes
 %if %{with i18n}