diff --git a/samba.spec b/samba.spec
index ba03e39..9ac7091 100644
--- a/samba.spec
+++ b/samba.spec
@@ -687,7 +687,9 @@ packages of Samba.
 %{_mandir}/man8/vfs_shadow_copy.8*
 %{_mandir}/man8/vfs_shadow_copy2.8*
 %{_mandir}/man8/vfs_shell_snap.8*
+%ifnarch %{armx}
 %{_mandir}/man8/vfs_snapper.8*
+%endif
 %{_mandir}/man8/vfs_streams_depot.8*
 %{_mandir}/man8/vfs_streams_xattr.8*
 %{_mandir}/man8/vfs_time_audit.8*
@@ -698,6 +700,7 @@ packages of Samba.
 %{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_syncops.8*
 %{_mandir}/man8/vfs_virusfilter.8*
+%{_datadir}/samba/mdssvc/elasticsearch_mappings.json
 
 %post common
 systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
@@ -1393,7 +1396,7 @@ chmod +x ./buildtools/bin/waf
 	--with-sockets-dir=/run/samba \
 	--with-statedir=%{_var}/lib/samba \
 	--with-cachedir=%{_var}/cache/samba \
-	--bundled-libraries=heimdal,!zlib,!popt,!talloc,!tevent,!tdb,!ldb \
+	--bundled-libraries=heimdal,NONE \
 	--enable-cups \
 	--enable-avahi \
 	--with-pam \