diff --git a/configure.in b/configure.in
index b62653f..49dfc5c 100644
--- a/configure.in
+++ b/configure.in
@@ -80,10 +80,10 @@ AC_ARG_ENABLE(libvirt-plugin,
 [ mod_libvirt=$enableval ], [ mod_libvirt=yes ])
 AC_SUBST(mod_libvirt)
 
-# checkpoint plugin: Enabled by default
+# checkpoint plugin: Disabled by default
 AC_ARG_ENABLE(checkpoint-plugin,
-[AS_HELP_STRING([--disable-checkpoint-plugin],
-		[Disable cluster checkpoint backend plugin])],
+[AS_HELP_STRING([--enable-checkpoint-plugin],
+		[Enable CMAN / AIS checkpoint backend plugin])],
 [ mod_checkpoint=$enableval ], [ mod_checkpoint=no ])
 AC_SUBST(mod_checkpoint)
 
diff --git a/server/Makefile.in b/server/Makefile.in
index 0e9b72e..719e325 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -76,6 +76,7 @@ ifneq ($(mod_libvirt_qmf),no)
 MODULES+=libvirt-qmf.so
 endif
 ifneq ($(mod_pm_fence),no)
+INCLUDES+=$(PACEMAKER_INCLUDES)
 MODULES+=pm-fence.so
 endif
 ifneq ($(mod_multicast),no)
diff --git a/server/pm_fence.c b/server/pm-fence.c
similarity index 100%
rename from server/pm_fence.c
rename to server/pm-fence.c