diff --git a/clamav-disable-yara.patch b/clamav-disable-yara.patch
new file mode 100644
index 0000000..dba452a
--- /dev/null
+++ b/clamav-disable-yara.patch
@@ -0,0 +1,39 @@
+--- m4/reorganization/yara.m4.orig
++++ m4/reorganization/yara.m4
+@@ -6,7 +6,7 @@ enable_yara=$enableval, enable_yara="yes
+ 
+ if test "$enable_yara" = "yes"; then
+     AC_DEFINE([HAVE_YARA],1,[yara sources are compiled in])
+-    AC_SUBST([HAVE_YARA])
++    AC_SUBST([HAVE_YARA], 1)
+ fi
+ 
+ 
+--- unit_tests/check_common.sh.orig
++++ unit_tests/check_common.sh
+@@ -222,6 +222,7 @@ EOF
+ 	scan_failed clamscan4.log "clamscan has detected spurious VI's"
+     fi
+ 
++if test "x$HAVE_YARA" = "x1"; then
+ cat <<EOF >test-db/test.yara
+ rule yara_at_offset {strings: \$tar_magic = { 75 73 74 61 72 } condition: \$tar_magic at 257}
+ EOF
+@@ -249,6 +250,7 @@ EOF
+     fi
+ 
+     test_end $1
++fi
+ }
+ 
+ # ----------- clamd tests --------------------------------------------------------
+--- configure.orig
++++ configure
+@@ -24324,6 +24324,7 @@ if test "$enable_yara" = "yes"; then
+ 
+ $as_echo "#define HAVE_YARA 1" >>confdefs.h
+ 
++    HAVE_YARA=1
+ 
+ fi
+ 
diff --git a/clamav.changes b/clamav.changes
index bc85353..2025746 100644
--- a/clamav.changes
+++ b/clamav.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
-Mon Jul 30 11:27:30 UTC 2018 - max@suse.com
+Tue Jul 31 08:43:39 UTC 2018 - max@suse.com
 
-- Disable YARA support for licensing reasons (bsc#1101654). 
+- bsc#1101654: Disable YARA support for licensing reasons
+  (clamav-disable-yara.patch).
+- Do not ignore errors from useradd et al.
 
 -------------------------------------------------------------------
 Wed Jul 25 16:23:09 UTC 2018 - mpluskal@suse.com
diff --git a/clamav.spec b/clamav.spec
index dbbc24f..373232c 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -35,6 +35,7 @@ Source11:       clamav.keyring
 Patch1:         clamav-conf.patch
 Patch4:         clamav-disable-timestamps.patch
 Patch5:         clamav-obsolete-config.patch
+Patch6:         clamav-disable-yara.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bc
@@ -109,6 +110,7 @@ that want to make use of libclamav.
 %patch1
 %patch4
 %patch5
+%patch6
 
 %build
 CFLAGS="-fstack-protector"
@@ -211,11 +213,11 @@ VALGRIND_GENSUP=1 make check
 %{_includedir}/*
 
 %pre
-getent group vscan >/dev/null || %{_sbindir}/groupadd -r vscan || :
+getent group vscan >/dev/null || %{_sbindir}/groupadd -r vscan
 getent passwd vscan >/dev/null || \
 	%{_sbindir}/useradd -r -o -g vscan -u 65 -s /bin/false \
-	-c "Vscan account" -d %{_localstatedir}/spool/amavis vscan || :
-%{_sbindir}/usermod vscan -g vscan 2> /dev/null || :
+	-c "Vscan account" -d %{_localstatedir}/spool/amavis vscan
+%{_sbindir}/usermod vscan -g vscan
 %service_add_pre clamd.service freshclam.service clamav-milter.service
 
 %post