diff --git a/configure.in b/configure.in
index 4ae082d..dc0942c 100644
--- a/configure.in
+++ b/configure.in
@@ -17,15 +17,11 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 # Checks for libraries.
-# FIXME: Replace `main' with a function in `-lSaCkpt':
 AC_CHECK_LIB([SaCkpt], [saCkptCheckpointOpen])
-# FIXME: Replace `main' with a function in `-lnss3':
+AC_CHECK_LIB([cpg], [cpg_finalize])
 AC_CHECK_LIB([nss3], [NSS_NoDB_Init])
-# FIXME: Replace `main' with a function in `-lpthread':
 AC_CHECK_LIB([pthread], [pthread_create])
-# FIXME: Replace `main' with a function in `-lvirt':
 AC_CHECK_LIB([virt], [virConnectOpen])
-# FIXME: Replace `main' with a function in `-lxml2':
 AC_CHECK_LIB([xml2], [main])
 
 
diff --git a/server/Makefile.in b/server/Makefile.in
index 5d3d930..25054a8 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -31,7 +31,8 @@ CFLAGS+=-DFENCE_RELEASE_NAME=\"devel\" -D_MODULE -DSYSCONFDIR=\"@sysconfdir@\"
 LIBS+=-L../common -lfence_virt -Wl,-wrap,syslog,-wrap,closelog -lpthread
       
 MAIN_LIBS=-L../config -lsimpleconfig -ldl
-AIS_LIBS=-L@libdir@/openais -lSaCkpt
+AIS_LIBS=-L/usr/lib64/openais -lSaCkpt		# XXX FIXME
+COROSYNC_LIBS=-L/usr/lib64/corosync -lcpg	
 VIRT_LIBS=-lvirt
 NSS_LIBS=-lnss3
 
@@ -50,7 +51,7 @@ null.so: ${null_so_SOURCES:.c=.o}
 	gcc -o $@ $^ $(LIBS) -shared
 
 checkpoint.so: ${checkpoint_so_SOURCES:.c=.o}
-	gcc -o $@ $^ $(LIBS) -shared $(AIS_LIBS) $(VIRT_LIBS)
+	gcc -o $@ $^ $(LIBS) -shared $(AIS_LIBS) $(VIRT_LIBS) $(COROSYNC_LIBS)
 
 %.o: %.c
 	gcc $(CFLAGS) -c -o $@ $^ $(INCLUDES)