diff --git a/syslinux.spec b/syslinux.spec
index d2edcc0..4fa06ad 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 6.04
 %define tarball_version 6.04-pre1
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
@@ -145,8 +145,8 @@ make efi64 install netinstall \
 	LDLINUX=ldlinux.c32
 %endif
 
-mkdir -p %{buildroot}/%{_docdir}/%{name}/sample
-install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}/sample/
+mkdir -p %{buildroot}%{_pkgdocdir}/sample
+install -m 644 sample/sample.* %{buildroot}%{_pkgdocdir}/sample/
 mkdir -p %{buildroot}/etc
 ( cd %{buildroot}/etc && ln -s ../boot/extlinux/extlinux.conf . )
 
@@ -176,6 +176,7 @@ rm -rf %{buildroot}
 %dir %{_datadir}/syslinux
 %dir %{_datadir}/syslinux/dosutil
 %{_datadir}/syslinux/dosutil/*
+%dir %{_datadir}/syslinux/diag
 %{_datadir}/syslinux/diag/*
 %ifarch %{ix86}
 %{_datadir}/syslinux/syslinux.exe
@@ -257,6 +258,10 @@ elif [ -f /boot/extlinux.conf ]; then \
 fi
 
 %changelog
+* Sat Mar 25 2017 Robert Scheck <robert@fedoraproject.org> - 6.04-0.3
+- Own %%{_datadir}/syslinux/diag directory (#894529)
+- Allow rebuilding on RHEL/CentOS 6 and 7 (#1291428)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild