diff --git a/m4-1.4.17.tar.bz2 b/m4-1.4.17.tar.bz2
deleted file mode 100644
index e1b0420..0000000
--- a/m4-1.4.17.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e4e1f963932136ed45dcd5afb0c6e237e96a6fcdcd2a2fa6755040859500d70
-size 1438525
diff --git a/m4-1.4.17.tar.bz2.sig b/m4-1.4.17.tar.bz2.sig
deleted file mode 100644
index f5b2fe3..0000000
--- a/m4-1.4.17.tar.bz2.sig
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.20 (Darwin)
-
-iEYEABECAAYFAlI+l0kACgkQFRMICSmD1gZaywCfQVBD8rkQslRZ8ijvMRF9ra4q
-ydkAnjo1nx7uU+vL4uaFAzpXuDO9ILHb
-=LXcY
------END PGP SIGNATURE-----
diff --git a/m4-1.4.18.tar.xz b/m4-1.4.18.tar.xz
new file mode 100644
index 0000000..cc7dd9e
--- /dev/null
+++ b/m4-1.4.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
+size 1207688
diff --git a/m4-1.4.18.tar.xz.sig b/m4-1.4.18.tar.xz.sig
new file mode 100644
index 0000000..db7e9ab
--- /dev/null
+++ b/m4-1.4.18.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: Public key at http://people.redhat.com/eblake/eblake.gpg
+
+iQEcBAABCAAGBQJYaDOKAAoJEKeha0olJ0NqT5oH/jyPC2chKyoCSrBAAmMT/0ac
+xbDOiymNbaj6twhoZNunE8m8OzySfBQxANFf0yepZ0dCPf8/SzCWt9eHs12xzTrs
+htcrsXBJ0woVdSG1SVaCzeOna8dvQ5fRJUHdWqTCa8sJdEBNk/zh2i72wGzMtpLo
+Ord+dXOplvRe+LTUyu7eMAQfccPb5PnL4sh6WgmvQpjUiP4y2BlpbcI7hU1OOPNz
+Gq63o3sO8OkwB2LP//M3fyi6Y4CHa7V6mfYz0PDboks1UruNYclbwVuJ8tLMYae+
+YlRMuMCs1hssICNcMyhtks8jdbXlMm7E8Nhk2+Uc6eRnA97zZQ0ADthNjA47/TA=
+=TQTI
+-----END PGP SIGNATURE-----
diff --git a/m4.changes b/m4.changes
index a0b29b7..ddd5be5 100644
--- a/m4.changes
+++ b/m4.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jan  5 14:28:13 UTC 2017 - mpluskal@suse.com
+
+- Update to version 1.4.18:
+  * Diagnose --word-regexp as unsupported if it was not configured.
+  * Preliminary support for OS/2.
+  * A number of portability improvements inherited from gnulib.
+- Some packaging changes:
+  * Use https url's
+  * Get keyring from savannah
+  * Use xs compressed files
+  * Make building more verbose
+
 -------------------------------------------------------------------
 Sat Oct  3 06:41:27 UTC 2015 - mpluskal@suse.com
 
diff --git a/m4.keyring b/m4.keyring
index 1ce5512..f935f28 100644
Binary files a/m4.keyring and b/m4.keyring differ
diff --git a/m4.spec b/m4.spec
index 34c6546..8b3827d 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package m4
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,18 @@
 
 
 Name:           m4
-Version:        1.4.17
+Version:        1.4.18
 Release:        0
 Summary:        GNU m4
 License:        GPL-3.0+
 Group:          Development/Languages/Other
-Url:            http://www.gnu.org/software/m4/
-Source0:        http://ftp.gnu.org/pub/gnu/m4/%{name}-%{version}.tar.bz2
-Source1:        http://ftp.gnu.org/pub/gnu/m4/%{name}-%{version}.tar.bz2.sig
-Source2:        %{name}.keyring
+Url:            https://www.gnu.org/software/m4/
+Source0:        https://ftp.gnu.org/pub/gnu/m4/%{name}-%{version}.tar.xz
+Source1:        https://ftp.gnu.org/pub/gnu/m4/%{name}-%{version}.tar.xz.sig
+Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=m4&download=1#/%{name}.keyring
 Requires(post): %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
 Provides:       base:%{_bindir}/m4
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GNU m4 is an implementation of the traditional Unix macro processor.
@@ -43,25 +42,27 @@ GNU m4 is an implementation of the traditional Unix macro processor.
 	gl_cv_func_isnanl_works=yes \
 	gl_cv_func_printf_directive_n=yes \
 	gl_cv_func_printf_infinite_long_double=yes
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %check
-make %{?_smp_mflags} check  || :
+make %{?_smp_mflags} check
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 
 %post
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info_delete --info-dir=%{_infodir} %%{_infodir}/%{name}.info%{ext_info}
 
 %files
 %defattr(-,root,root)
 %doc README COPYING NEWS THANKS TODO ChangeLog
-%{_bindir}/*
-%{_infodir}/*.gz
-%{_mandir}/*/*
+%{_bindir}/m4
+%{_infodir}/m4.info-1%{ext_info}
+%{_infodir}/m4.info-2%{ext_info}
+%{_infodir}/m4.info%{ext_info}
+%{_mandir}/man1/m4.1%{ext_man}
 
 %changelog