diff --git a/lib/coroipcc.c b/lib/coroipcc.c
index e6bfea78..fb4707a4 100644
--- a/lib/coroipcc.c
+++ b/lib/coroipcc.c
@@ -819,9 +819,11 @@ coroipcc_dispatch_get (
 		goto error_put;
 	} else
 	if (poll_events == -1) {
+		error = CS_ERR_LIBRARY;
 		goto error_put;
 	} else
 	if (poll_events == 0) {
+		error = CS_ERR_TRY_AGAIN;
 		goto error_put;
 	}
 	if (poll_events == 1 && (ufds.revents & (POLLERR|POLLHUP))) {
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9b6201fb..11183457 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -34,7 +34,7 @@ INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
 sbin_PROGRAMS		= corosync-fplay corosync-cfgtool \
 			  corosync-keygen corosync-objctl \
-			  corosync-pload corosync-cpgtool
+			  corosync-pload corosync-cpgtool corosync-quorumtool
 
 corosync_pload_LDADD	= -lpload -lcoroipcc
 corosync_pload_LDFLAGS	= -L../lib
@@ -44,6 +44,9 @@ corosync_cfgtool_LDADD	= -lcfg -lcoroipcc
 corosync_cfgtool_LDFLAGS= -L../lib
 corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
 corosync_cpgtool_LDFLAGS= -L../lib
+corosync_quorumtool_LDADD = -lconfdb -lcfg -lquorum \
+			    -lvotequorum -lcoroipcc ../lcr/liblcr.a
+corosync_quorumtool_LDFLAGS = -L../lib
 
 lint:
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c