diff --git a/hplip.changes b/hplip.changes
index 1464b81..08a544e 100644
--- a/hplip.changes
+++ b/hplip.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 16 07:52:48 UTC 2019 - Martin Liška <mliska@suse.cz>
+
+- Disable -Werror=return-type for now.
+- Use %make_build for parallel build.
+
 -------------------------------------------------------------------
 Fri Apr 12 16:33:57 UTC 2019 - Johannes Weberhofer <jweberhofer@weberhofer.at>
 
diff --git a/hplip.spec b/hplip.spec
index 30c4622..2c73edd 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -429,8 +429,8 @@ sed -i -e 's|/usr/share/icons/Humanity/devices/48/printer.svg|printer|' hp-uisca
 # in each directory where a Makefile.am exists:
 AUTOMAKE='automake --foreign' autoreconf -fvi
 # Set our preferred architecture-specific flags for the compiler and linker:
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
+export CFLAGS="%{optflags} -Wno-error=return-type"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing -Wno-error=return-type"
 # --disable-pp-build disables parallel port build because parallel port support is deprecated by upstream HPLIP
 # and by upstream in general cf. "Parallel port printers" at https://en.opensuse.org/SDB:Installing_a_Printer
 # Since version 3.9.6 the default printer driver install changed from hpijs to hpcups.
@@ -486,9 +486,9 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
             --with-mimedir=%{_sysconfdir}/cups \
             --with-docdir=%{_defaultdocdir}/%{name} \
             --with-htmldir==%{_defaultdocdir}/%{name} \
-	    CFLAGS='%{optflags}' \
+	    CFLAGS='%{optflags} -Wno-error=return-type' \
 	    PYTHON=%{pyexe}
-make
+%make_build
 sed -i 's|ppd/hpcups/\*.ppd.gz ||g' Makefile
 
 %install