diff --git a/bison-3.0.4.tar.xz b/bison-3.0.4.tar.xz
deleted file mode 100644
index 53e7196..0000000
--- a/bison-3.0.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1
-size 1973796
diff --git a/bison-3.0.4.tar.xz.sig b/bison-3.0.4.tar.xz.sig
deleted file mode 100644
index 5b3f130..0000000
--- a/bison-3.0.4.tar.xz.sig
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlTCU3gACgkQDdyqMnjVJk4b9gCfVqLxw16p7bcjQ2dIaXo/iz9/
-yRMAnRm8fwB9rwbjvtnjib6L3Pe8owMC
-=nPY9
------END PGP SIGNATURE-----
diff --git a/bison-3.0.5.tar.xz b/bison-3.0.5.tar.xz
new file mode 100644
index 0000000..47e3738
--- /dev/null
+++ b/bison-3.0.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:075cef2e814642e30e10e8155e93022e4a91ca38a65aa1d5467d4e969f97f338
+size 1954868
diff --git a/bison-3.0.5.tar.xz.sig b/bison-3.0.5.tar.xz.sig
new file mode 100644
index 0000000..611a84b
--- /dev/null
+++ b/bison-3.0.5.tar.xz.sig
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAlsLkJUACgkQDdyqMnjVJk7xLQCfRdoDCePYtQoUB2A45c9N/EQU
+tYoAnA2HjG7NiF2qyLrZZbKO6Li8mplU
+=LR2v
+-----END PGP SIGNATURE-----
diff --git a/bison.changes b/bison.changes
index 53b3904..ecb4ebf 100644
--- a/bison.changes
+++ b/bison.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 15 19:11:25 UTC 2018 - astieger@suse.com
+
+- bison 3.0.5:
+  * C++: Fix support of 'syntax_error'
+  * Fix various C++ warnings
+  * Fix issues with C++ parsers where out-of-bounds errors could
+    happen when a rule with an empty ride-hand side raises a
+    syntax error
+- drop gcc7-fix.patch, no longer required
+
 -------------------------------------------------------------------
 Fri Dec 16 09:45:23 UTC 2016 - mliska@suse.cz
 
diff --git a/bison.spec b/bison.spec
index 8014d15..832a1b8 100644
--- a/bison.spec
+++ b/bison.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bison
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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,26 +17,24 @@
 
 
 Name:           bison
-Version:        3.0.4
+Version:        3.0.5
 Release:        0
 Summary:        The GNU Parser Generator
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Development/Languages/C and C++
-Url:            http://www.gnu.org/software/bison/bison.html
+URL:            http://www.gnu.org/software/bison/bison.html
 Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source1:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
-Patch1:         gcc7-fix.patch
 BuildRequires:  autoconf
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  xz
 Requires:       m4
-Requires(post):  %{install_info_prereq}
+Requires(post): %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Bison is a parser generator similar to yacc(1).
@@ -45,7 +43,6 @@ Bison is a parser generator similar to yacc(1).
 
 %prep
 %setup -q
-%patch1
 
 %build
 %configure --disable-silent-rules \
@@ -59,11 +56,10 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} check
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 %find_lang %{name} --all-name
 
 %files
-%defattr(-,root,root)
 %{_docdir}/%{name}
 %dir %{_datadir}/aclocal
 %{_bindir}/bison
@@ -73,11 +69,10 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/bison-i18n.m4
 %{_infodir}/bison.info*.gz
-%{_mandir}/man1/bison.1.gz
-%{_mandir}/man1/yacc.1.gz
+%{_mandir}/man1/bison.1%{?ext_man}
+%{_mandir}/man1/yacc.1%{?ext_man}
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
diff --git a/gcc7-fix.patch b/gcc7-fix.patch
deleted file mode 100644
index a7e3163..0000000
--- a/gcc7-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /home/marxin/Programming/bison-3.0.4/tests/c++.at	2015-01-20 20:39:51.000000000 +0100
-+++ tests/c++.at	2016-12-14 10:58:00.046437207 +0100
-@@ -197,6 +197,10 @@
- #include <list>
- #include <string>
- typedef std::list<std::string> strings_type;
-+namespace std
-+{
-+  std::ostream& operator<<(std::ostream& o, const strings_type& s);
-+}
- }
- 
- %code // code for the .cc file