diff --git a/davfs2.changes b/davfs2.changes
index 5d3d820..04a66bc 100644
--- a/davfs2.changes
+++ b/davfs2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 26 11:27:55 UTC 2018 - jengelh@inai.de
+
+- Replace %__-type macro indirections. Do not ignore errors from
+  useradd. Remove Fedora definitions. Restore debug creation.
+  Compact grammar in description.
+
 -------------------------------------------------------------------
 Tue Feb 20 00:00:00 CET 2018 - dsterba@suse.cz
 
diff --git a/davfs2.spec b/davfs2.spec
index 8b05a1a..d8b0904 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -32,27 +32,19 @@ BuildRequires:  fuse-devel >= 2.2
 BuildRequires:  neon-devel
 BuildRequires:  pwdutils
 Requires:       fuse >= 2.2
-PreReq:         /usr/sbin/groupadd
-PreReq:         /usr/sbin/useradd
-%if 0%{?fedora} == 0
-Requires(pre):  pwdutils
-Requires(pre):  permissions
-%else
-Requires(pre):  shadow-utils
-%endif
-#
+Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  /usr/sbin/useradd
 Obsoletes:      fuse-%{name} < %{version}
 Provides:       fuse-%{name} = %{version}
 
 %description
-davfs2 is a FUSE file system driver that allows you to mount a WebDAV server
-as a local file system, like a disk drive. This way applications can access
+davfs2 is a FUSE file system driver that allows mounting a WebDAV server
+as a local file system, like a disk drive. This way, applications can access
 resources on a Web server without knowing anything about HTTP or WebDAV.
 
-davfs2 runs as a daemon in userspace. It uses the kernel file system coda or
-fuse. Most propably your Linux kernel includes at least one of this file
-systems. To connect to the WebDAV server it makes use of the neon library.
-Neon supports TLS/SSL (using OpenSSL or GnuTLS) and access via proxy server.
+davfs2 runs as a daemon in userspace. It uses the kernel file system "coda", or
+FUSE. To connect to the WebDAV server, it makes use of the neon library,
+supporting TLS/SSL and access via proxy servers.
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -68,28 +60,18 @@ dav_group="%{name}" \
 PIE="-fPIE"
 pie="-pie"
 %endif
-make AM_CFLAGS="-Wall $RPM_OPT_FLAGS $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags}
+make AM_CFLAGS="-Wall %{optflags} $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags}
 
 %install
-%{?make_install}
-%{!?make_install:%__make DESTDIR=%{?buildroot} install}
-
-%__rm -rf "%{buildroot}%{_datadir}/doc"
-
-%__install -d "%{buildroot}/var/cache/%{name}"
-
+%make_install
+rm -rf "%{buildroot}%{_datadir}/doc"
+install -d "%{buildroot}/var/cache/%{name}"
 %find_lang %{name}
-
-%__rm -rf "%{buildroot}%{_docdir}"
-
-# debuginfo is broken
-#%__debug_install_post
-find %{buildroot}/usr/lib/debug -name '*davfs*' -print -delete
-find %{buildroot}/usr/lib/debug -lname '*davfs*' -print -delete
+rm -rf "%{buildroot}/%{_docdir}"
 
 %pre
-/usr/bin/getent group %{name} >/dev/null 2>&1 || /usr/sbin/groupadd -r %{name} || :
-/usr/bin/getent passwd %{name} >/dev/null 2>&1 || /usr/sbin/useradd -r -g %{name} -d /var/cache/%{name} %{name} || :
+/usr/bin/getent group %{name} >/dev/null || /usr/sbin/groupadd -r %{name}
+/usr/bin/getent passwd %{name} >/dev/null || /usr/sbin/useradd -r -g %{name} -d /var/cache/%{name} %{name}
 
 %post
 %if 0%{?set_permissions:1} > 0