diff --git a/ChangeLog b/ChangeLog
index e553bacc88..17c07ee73a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 12 19:16:00 +0000 2009 Richard W.M. Jones <rjones@redhat.com>
+
+	Fix invocation of rpcgen.
+	* qemud/Makefile.am: Fix invocation of rpcgen, and make sure
+	we run the right one.
+
 Mon Jan 12 18:55:16 +0100 2009 Jim Meyering <meyering@redhat.com>
 
 	tests: quiet virsh-all
diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 236212d96c..38646223e0 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+RPCGEN = $(RPCGEN)
+
 DAEMON_SOURCES =					\
 		event.c event.h				\
 		qemud.c qemud.h				\
@@ -37,24 +39,27 @@ SUFFIXES = .x
 # including <config.h> before "remote_protocol.h".
 .x.c:
 	rm -f $@ $@-t $@-t1 $@-t2
-	rpcgen -c -o $@-t $<
+	$(RPCGEN) -c -o $@-t $<
 	(echo '#include <config.h>'; cat $@-t) > $@-t1
 if GLIBC_RPCGEN
 	perl -w rpcgen_fix.pl $@-t1 > $@-t2
 	rm $@-t1
 	chmod 444 $@-t2
 	mv $@-t2 $@
+else
+	chmod 444 $@-t1
+	mv $@-t1 $@
 endif
 
 .x.h:
 	rm -f $@ $@-t
-	rpcgen -h -o $@-t $<
+	$(RPCGEN) -h -o $@-t $<
 if GLIBC_RPCGEN
 	perl -pi -e 's/\t/        /g' $@-t
+endif
 	chmod 444 $@-t
 	mv $@-t $@
 endif
-endif
 
 remote_protocol.c: remote_protocol.h