diff --git a/exim-4.83.tar.bz2 b/exim-4.83.tar.bz2
deleted file mode 100644
index f0b0dfc..0000000
--- a/exim-4.83.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efa031b89ffb2ab844a4bf9d3a5d7ca4d587d82b62ae233d68c4f26e079a6a02
-size 1761169
diff --git a/exim-4.83.tar.bz2.asc b/exim-4.83.tar.bz2.asc
deleted file mode 100644
index 23fa3bd..0000000
--- a/exim-4.83.tar.bz2.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlPNLg4ACgkQxPT5SATSnrpiSQCfVelBsGwYu5MrHF6F9JK77Vx0
-d20AmwbNDqDWF+exEH7ARQOxJWPWlFjJ
-=fdcr
------END PGP SIGNATURE-----
diff --git a/exim-4.84.tar.bz2 b/exim-4.84.tar.bz2
new file mode 100644
index 0000000..1dfcd32
--- /dev/null
+++ b/exim-4.84.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c
+size 1761790
diff --git a/exim-4.84.tar.bz2.asc b/exim-4.84.tar.bz2.asc
new file mode 100644
index 0000000..53a76e9
--- /dev/null
+++ b/exim-4.84.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlPowoIACgkQxPT5SATSnrpzGwCdEBRSfY/KxYzH2rGJHJ1wROZx
+BQcAn1u16GyO8NsysIbwmKKyEMbSOQgo
+=S0E2
+-----END PGP SIGNATURE-----
diff --git a/exim.changes b/exim.changes
index c143ce3..2cee6ad 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Nov 26 14:38:41 UTC 2014 - lmuelle@suse.com
+
+- Remove dependency on gpg-offline as signature checking is implemented in the
+  source validator.
+
+-------------------------------------------------------------------
+Wed Nov 26 13:13:38 UTC 2014 - lmuelle@suse.com
+
+- update to 4.84
+  + Re-add a 'return NULL' to silence complaints from static checkers that
+    were complaining about end of non-void function with no return;
+	 (beo#1506); obsoletes silence-static-checkers.patch.
+  + Fix parsing of quoted parameter values in MIME headers.
+    This was a regression intruduced in 4.83 by another bugfix; (beo#1513).
+  + Fix broken compilation when EXPERIMENTAL_DSN is enabled.
+  + Fix exipick for enhanced spoolfile specification used when
+    EXPERIMENTAL_DNS is enabled; (beo#1509).
+
 -------------------------------------------------------------------
 Tue Aug 12 13:46:29 UTC 2014 - p.drouand@gmail.com
 
diff --git a/exim-pubkey_04d29eba.asc b/exim.keyring
similarity index 100%
rename from exim-pubkey_04d29eba.asc
rename to exim.keyring
diff --git a/exim.spec b/exim.spec
index 0af9ecf..b673656 100644
--- a/exim.spec
+++ b/exim.spec
@@ -39,7 +39,6 @@ Provides:       smtp_daemon
 %if %{?suse_version:%suse_version}%{?!suse_version:0} > 800
 Requires:       logrotate
 %if 0%{?suse_version} > 1220
-BuildRequires:  gpg-offline
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 %else
@@ -49,7 +48,7 @@ Requires(pre):  %fillup_prereq
 Requires(pre):  /usr/sbin/useradd
 Requires(pre):  fileutils textutils
 %endif
-Version:        4.83
+Version:        4.84
 Release:        0
 %if %{?build_with_mysql:1}0
 BuildRequires:  mysql-devel
@@ -65,7 +64,7 @@ Group:          Productivity/Networking/Email/Servers
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         exim-%{version}.tar.bz2
 Source3:        exim-%{version}.tar.bz2.asc
-Source4:        exim-pubkey_04d29eba.asc
+Source4:        exim.keyring
 Source1:        sysconfig.exim
 Source2:        exim.logrotate
 Source11:       exim.rc
@@ -77,7 +76,6 @@ Source31:       eximstats.conf
 Source32:       exim.service
 Patch:          exim-tail.patch
 Patch1:         exim-enable_ecdh_openssl.patch
-Patch2:         silence-static-checkers.patch
 %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0
 
 %package -n eximon
@@ -127,11 +125,9 @@ once, if at all. The rest is done by logrotate / cron.)
 %endif
 
 %prep
-%{?gpg_verify: %gpg_verify --keyring %{SOURCE4} %{SOURCE3}}
 %setup -q -n exim-%{version}
 %patch
 %patch1 -p1
-%patch2 -p1
 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
 fPIE="-fPIE"
diff --git a/silence-static-checkers.patch b/silence-static-checkers.patch
deleted file mode 100644
index dd64167..0000000
--- a/silence-static-checkers.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Lars Mueller <lmuelle@suse.com>
-Date:   Wed Jul 23 07:22:52 2014 -0700
-
-    Bug 1506: Silence static checkers.
-····
-    Re-adds a return NULL which was removed because it was redundant. Static
-      checkers don't parse the logic, so adding it back to make them happy.
-
-Index: exim-4.83/src/expand.c
-===================================================================
---- exim-4.83.orig/src/expand.c
-+++ exim-4.83/src/expand.c
-@@ -1879,6 +1879,8 @@ switch (vp->type)
-   #endif
- 
-   }
-+
-+return NULL;  /* Unknown variable. Silences static checkers. */
- }
- 
-