diff --git a/dd_rescue-1.98.tar.bz2 b/dd_rescue-1.98.tar.bz2
deleted file mode 100644
index f04a881..0000000
--- a/dd_rescue-1.98.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb689dc82341a9b775e25d68adb91fcd6541b2ce014b7c4e32216b51f6158e92
-size 155963
diff --git a/dd_rescue-1.98.tar.bz2.asc b/dd_rescue-1.98.tar.bz2.asc
deleted file mode 100644
index 6ef8551..0000000
--- a/dd_rescue-1.98.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABAgAGBQJVafo3AAoJEN5PGzor/8W/4lQP/335NyLO7Kbbvm+1a1D2kjak
-MrWTKOTtMloJSZuFf1dTME2r8wl0HOblFRZeuz7bMATHRVDJNE7jNk5+YKCJmQJC
-NKhmb7hQxPQnZ5uAS4/JBRwraT1ZVFkO/FcaLBvlYETaLPDsg/Kuvjb4ynyXfiNz
-PlDypCte/4Ksh69568d0NTBAJmiSXFHDKiO7tOwjNl79ZIGBGFENtVm+WVNNZ+0M
-oxZjUg+NXQXSYYC90NDIdzLxb9IVxHNVo0VDE4xgDf5biX4Qc+IdFwH4AC0dJFQG
-hLtdOpXRsWZw3B06/+XqRWyi0G64vYnF/m/BHqnRGIIzC/skRdS3XMtleg8pcPcC
-NNodh/5MuUOnL+z9C9AziQAkpgDH8llGGcJRIuLVF9lSeAiTfYdR53+eyFfA9GjL
-fmOOscPEA2I+muxcCxlLZF1rx52lrL45aNfTG/37hApVrSMyelrZUOIgDHzMDlv0
-29DJZsIQQgUtrHNuGlrACf8muk02NWwtExgHJ/iqBjWlpnav4NeS9fcil1iqVhOR
-dLELOHDBv+K5AEIGD5Cv/WQCEw7crW/lV9IBn+s3+mMv3twX4zoY90DXc4WkHZww
-jcrE1XuklU7+i384HTOwvclqsKM2IsPHuofyIQGcRXAFr1LFl+88CavA3xXEcohw
-4Ory7Yk1V6aHLr7CFI4q
-=irlk
------END PGP SIGNATURE-----
diff --git a/dd_rescue-1.99.5.tar.bz2 b/dd_rescue-1.99.5.tar.bz2
new file mode 100644
index 0000000..b1ec494
--- /dev/null
+++ b/dd_rescue-1.99.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935
+size 170712
diff --git a/dd_rescue-1.99.5.tar.bz2.asc b/dd_rescue-1.99.5.tar.bz2.asc
new file mode 100644
index 0000000..ccef5ae
--- /dev/null
+++ b/dd_rescue-1.99.5.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIVAwUAWGU/vN5PGzor/8W/AQi0nxAAg1kee3LKnfI9AOGguXUAiWMRe4IkyjbX
+x+5Rh3TWuBNvSGQeLPVC2NMgxYC6ejM2PXkiUNZpxyZyW2j4gHEiLzu3VeX+Arn5
+LBVkX8ilTzX0R/2SLDhtjOLpmWfxt6MC1BEwnbXfhLT/4EwDH2dCWzv+7gcAMw0F
+9v2p7u386FH9XZI7UYdfM0w5DWqXZp9HxMWDZC2edMaor/G/nrK+BTw7gBXZlTGJ
+1m7Mgv489F33Kf1ff8CNtnk26IpqK9DXyYoJt0seXysTjP0gUVjdqzKUMybkOXXY
+MpIrk30xg2hstLpKePJx4n+3cpBcndKpZ4+wYfvYSKDWlM2q/vAn3gWmREkhz0Ng
++QR5VO3UmCEhs1MlNZZpIwGqxGCTDegk72FVzlQdWQRKoBsbWsbW+HTVnGysM6Kx
+t0H6Kzcau53vaN4djVwYSE6ZslUbcjovHIeN7ow9YO2EGQwsbpRW1CJs6UZg73WM
+tPmb+aQQsCAsDGmCev7jMbMOGMLNww3X4FYSArE83+tuhlhjeoh1Hy0pD1bXli0I
+Bwz16L/Hgo0UQGcQRTTKAQRprNWC/FfJQ/UmfKPKAZj+N4HGWfITtpKJEKeTT4F8
+0+h3OjBN9t+/nFw+r2DLN67S7yf5o87KYDVCIbB3btnoGIXas4oy8FFwWsRLWpkZ
+zEviZeRf4vc=
+=31j7
+-----END PGP SIGNATURE-----
diff --git a/dd_rescue.changes b/dd_rescue.changes
index c72151e..9526e19 100644
--- a/dd_rescue.changes
+++ b/dd_rescue.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu Dec 29 22:27:17 CET 2016 - kurt@garloff.de
+
+- Update to dd_rescue-1.99.5:
+  * Merge the two gcc7 patches from Martin Liska.
+  * Better transfer length estimate (thus better progress report)
+  * Optional ratecontrol (throttle transfer speed) 
+  * fmt_no was unsafe against undetermined length (pre=0) and
+    visible digit grouping characters, resulting in memory
+    corruption when using a -b logfile. Thanks to Marc Thomas
+    for reporting and debugging!
+  * A few more minor cleanups and bugfixes.
+  * Fix segfault with graph in reverse direction with
+    too large transfer limit.
+  * Fix build with AES but not AVX2 support.
+- Update to dd_rescue-1.99:
+  * ddr_crypt plugin: Add support for ARMv8 aes hardware acceleration 
+    (works as well in 32bit mode).
+  * ddr_crypt: Fix CTR iv initialization.
+  * ddr_crypt: Support for openSSL Salted__ header.
+  * Support ranges in fault injection.
+  * Clean up write retry logic.
+  * Improved documentation, Makefiles and test coverage.
+
+-------------------------------------------------------------------
+Fri Dec 23 09:26:20 UTC 2016 - mliska@suse.cz
+
+- Add gcc7-fix-htonl.patch patch.
+
 -------------------------------------------------------------------
 Fri Dec  9 11:56:45 UTC 2016 - mliska@suse.cz
 
diff --git a/dd_rescue.keyring b/dd_rescue.keyring
index 2d5b91b..09bb452 100644
Binary files a/dd_rescue.keyring and b/dd_rescue.keyring differ
diff --git a/dd_rescue.spec b/dd_rescue.spec
index 330df10..2300219 100644
--- a/dd_rescue.spec
+++ b/dd_rescue.spec
@@ -17,7 +17,7 @@
 
 
 Name:           dd_rescue
-Version:        1.98
+Version:        1.99.5
 Release:        0
 Summary:        Data Copying in the Presence of I/O Errors
 License:        GPL-2.0 or GPL-3.0
@@ -28,8 +28,6 @@ Source1:        http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2
 Source2:        %{name}.keyring
 Source99:       %{name}.changes
 
-# PATCH-FIX-OPENSUSE gcc7-static-inline.patch - Add 'static' to inlined fns
-Patch1:         gcc7-static-inline.patch
 BuildRequires:  autoconf
 BuildRequires:  libattr-devel
 BuildRequires:  lzo-devel
@@ -118,7 +116,6 @@ data to the decompressor; the plugin is still young and might expose bugs.
 
 %prep
 %setup -q 
-%patch1
 ./autogen.sh
 
 # Remove build time references so build-compare can do its work
diff --git a/gcc7-static-inline.patch b/gcc7-static-inline.patch
deleted file mode 100644
index 62877d3..0000000
--- a/gcc7-static-inline.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- /tmp/dd_rescue.c	2016-12-09 12:49:49.868777805 +0100
-+++ dd_rescue.c	2016-12-09 12:49:57.680925114 +0100
-@@ -315,12 +315,12 @@
- }
- #endif
- 
--inline char* fmt_kiB(loff_t no, char col)
-+static inline char* fmt_kiB(loff_t no, char col)
- {
- 	return fmt_int(0, 1, 1024, no, (col? BOLD: ""), (col? NORM: ""), 1);
- }
- 
--inline float difftimetv(const struct timeval* const t2, 
-+static inline float difftimetv(const struct timeval* const t2, 
- 			const struct timeval* const t1)
- {
- 	return  (float) (t2->tv_sec  - t1->tv_sec ) +
-@@ -724,7 +724,7 @@
- }
- 
- /** Calc position in graph */
--inline int gpos(loff_t off, loff_t len)
-+static inline int gpos(loff_t off, loff_t len)
- {
- 	static const int glen = 40; //strlen(graph) - 2;
- 	return 1+(glen*off/len);