diff --git a/zfs.spec.in b/zfs.spec.in
index 4b5b3ea71..07b16e8e7 100644
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -74,17 +74,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
-%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
 %{_sbindir}/*
 %{_bindir}/*
 %{_libdir}/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%{_sysconfdir}/init.d/*
-%{_sysconfdir}/zfs/*
 %{_udevdir}/*
 
+%config %{_sysconfdir}/init.d/*
+%config %{_sysconfdir}/zfs/*
+%config(noreplace) %{_sysconfdir}/zfs/zdev.conf
+
+%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
+%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*