diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c15c785c637658ec2aba5397f0ad77de279e82fc..b00fc13bce764ed3b962f6c2860749f11741be32 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -87,7 +87,6 @@ libvirtd.8: $(srcdir)/libvirtd.8.in
 	sed \
 	    -e 's!SYSCONFDIR!$(sysconfdir)!g' \
 	    -e 's!LOCALSTATEDIR!$(localstatedir)!g' \
-	    -e 's!REMOTE_PID_FILE!$(REMOTE_PID_FILE)!g' \
 	    < $< > $@-t
 	mv $@-t $@
 
@@ -99,8 +98,7 @@ libvirtd_CFLAGS = \
 	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
 	$(WARN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
-	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\""
+	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
 
 libvirtd_LDFLAGS =					\
 	$(WARN_CFLAGS)					\
diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in
index 7dc8d83eaf6d938a6d45a0ba986d4eafb5671002..2b68cab0f40918821645b0281c9728df8c8d4b12 100644
--- a/daemon/libvirtd.pod.in
+++ b/daemon/libvirtd.pod.in
@@ -104,7 +104,7 @@ The TLS B<Server> certificate libvirtd will use.
 
 The TLS B<Server> private key libvirtd will use.
 
-=item F<REMOTE_PID_FILE>
+=item F<LOCALSTATEDIR/run/libvirtd.pid>
 
 The PID file to use, unless overridden by the B<-p>|B<--pid-file> option.
 
@@ -121,8 +121,8 @@ To retrieve the version of libvirtd:
 To start libvirtd, instructing it to daemonize and create a PID file:
 
  # libvirtd -d
- # ls -la REMOTE_PID_FILE
- -rw-r--r-- 1 root root 6 Jul  9 02:40 REMOTE_PID_FILE
+ # ls -la LOCALSTATEDIR/run/libvirtd.pid
+ -rw-r--r-- 1 root root 6 Jul  9 02:40 LOCALSTATEDIR/run/libvirtd.pid
  #
 
 =head1 BUGS