diff --git a/conman.spec b/conman.spec
index a3a4d0e..90c7633 100644
--- a/conman.spec
+++ b/conman.spec
@@ -141,15 +141,15 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 cat >> %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
 d %_localstatedir%_rundir/%{name} 0755 %{conman_u} %{conman_g} -
 EOF
-mkdir -p %{buildroot}%{_localstatedir}/log/%{conmandir}
+mkdir -p %{buildroot}%{_localstatedir}/log/%{?conmandir}
 %endif
 if ! grep "^SERVER" %{buildroot}/etc/conman.conf > /dev/null; then
     cat <<EOF >> %{buildroot}/etc/conman.conf
 SERVER keepalive=ON
-SERVER logdir="/var/log/%{conmandir}"
-SERVER logfile="/var/log/%{conmandir}conman.log"
+SERVER logdir="/var/log/%{?conmandir}"
+SERVER logfile="/var/log/%{?conmandir}conman.log"
 SERVER loopback=ON
-SERVER pidfile="/var/run/%{conmandir}conman.pid"
+SERVER pidfile="/var/run/%{?conmandir}conman.pid"
 SERVER tcpwrappers=ON
 SERVER timestamp=1h
 GLOBAL seropts="115200,8n1"
@@ -162,7 +162,7 @@ fi
 %pre
 %service_add_pre conman.service
 %if 0%{?conmandir:1}
-%define conman_home "%_localstatedir%_rundir/%conmandir"
+%define conman_home "%_localstatedir%_rundir/%{?conmandir}"
 %define conman_descr "Connection Manager service"
 shopt -s nullglob
 addgrp=0; addusr=0
@@ -192,9 +192,9 @@ exit 0
 [ -d %_localstatedir/lib/conman ] || mkdir %_localstatedir/lib/conman || :
 if [ $1 -eq 2 -a ! -e %_localstatedir/lib/conman/%migrated ]; then
     tmpfile=$(mktemp /tmp/tmp-XXXX)
-    sed  -e "s@^\(server\)\|\(SERVER\) \+logdir=.*@SERVER logdir=\"/var/log/%{conmandir}\"@" \
-	-e "s@^\(server\)\|\(SERVER\) \+logfile=.*@SERVER logfile=\"/var/log/%{conmandir}conman.log\"@" \
-	-e "s@^\(server\)\|\(SERVER\) \+pidfile=.*@SERVER pidfile=\"/var/run/%{conmandir}conman.pid\"@" \
+    sed  -e "s@^\(server\)\|\(SERVER\) \+logdir=.*@SERVER logdir=\"/var/log/%{?conmandir}\"@" \
+	-e "s@^\(server\)\|\(SERVER\) \+logfile=.*@SERVER logfile=\"/var/log/%{?conmandir}conman.log\"@" \
+	-e "s@^\(server\)\|\(SERVER\) \+pidfile=.*@SERVER pidfile=\"/var/run/%{?conmandir}conman.pid\"@" \
 	< /etc/conman.conf > $tmpfile
     if ! cmp /etc/conman.conf $tmpfile; then
 	mv /etc/conman.conf /etc/conman.conf.rpmsave