diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
index b4830efe3f..17ffe99c82 100644
--- a/lib/cib/Makefile.am
+++ b/lib/cib/Makefile.am
@@ -1,45 +1,45 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl
 
 ## libraries
 lib_LTLIBRARIES	= libcib.la
 
 ## SOURCES
 noinst_HEADERS		= cib_private.h
 libcib_la_SOURCES	= cib_ops.c cib_utils.c cib_client.c cib_native.c cib_attrs.c
 libcib_la_SOURCES      += cib_version.c cib_file.c cib_remote.c
 
 if ENABLE_ACL
 libcib_la_SOURCES       += cib_acl.c
 endif
 
-libcib_la_LDFLAGS	= -version-info 1:1:0 $(top_builddir)/lib/common/libcrmcommon.la $(CRYPTOLIB) \
+libcib_la_LDFLAGS	= -version-info 2:0:1 $(top_builddir)/lib/common/libcrmcommon.la $(CRYPTOLIB) \
 			$(top_builddir)/lib/pengine/libpe_rules.la
 
 libcib_la_CFLAGS	= -I$(top_srcdir)
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
diff --git a/lib/cluster/Makefile.am b/lib/cluster/Makefile.am
index e5dce425b1..6b56fe8095 100644
--- a/lib/cluster/Makefile.am
+++ b/lib/cluster/Makefile.am
@@ -1,53 +1,53 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES       	= -I$(top_builddir)/include  -I$(top_srcdir)/include   \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl
 
 headerdir=$(pkgincludedir)/crm/cluster
 
 header_HEADERS = stack.h
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcluster.la 
 
 libcrmcluster_la_SOURCES = cluster.c membership.c stack.h
-libcrmcluster_la_LDFLAGS = -version-info 1:0:0 $(CLUSTERLIBS) 
+libcrmcluster_la_LDFLAGS = -version-info 2:0:0 $(CLUSTERLIBS) 
 libcrmcluster_la_LIBADD  = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la
 libcrmcluster_la_DEPENDENCIES = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la 
 
 if BUILD_CS_SUPPORT
 if BUILD_CS_PLUGIN
 libcrmcluster_la_SOURCES += legacy.c
 else
 libcrmcluster_la_SOURCES += corosync.c
 endif
 endif
 
 if BUILD_HEARTBEAT_SUPPORT
 libcrmcluster_la_SOURCES += heartbeat.c
 #libcrmcluster_la_LIBADD  += -ldl
 endif
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 3a2c98af6e..19827253b5 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -1,50 +1,50 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES       	= -I$(top_builddir)/include  -I$(top_srcdir)/include   \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl   \
 		  -I$(top_builddir)/lib/gnu  -I$(top_srcdir)/lib/gnu
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcommon.la
 
 # Can't use -Wcast-qual here because glib insists on pretending things are const  
 # when they're not and thus we need the crm_element_value_const() hack
 
 # s390 needs -fPIC 
 # s390-suse-linux/bin/ld: .libs/ipc.o: relocation R_390_PC32DBL against `__stack_chk_fail@@GLIBC_2.4' can not be used when making a shared object; recompile with -fPIC
 
 CFLAGS		= $(CFLAGS_COPY:-Wcast-qual=) -fPIC
 
 libcrmcommon_la_SOURCES	= ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
 
-libcrmcommon_la_LDFLAGS	= -version-info 2:0:0
+libcrmcommon_la_LDFLAGS	= -version-info 3:0:0
 libcrmcommon_la_LIBADD  = -ldl $(GNUTLSLIBS)
 libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 
 if BUILD_HEARTBEAT_SUPPORT
 libcrmcommon_la_SOURCES += heartbeat.c
 endif
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
diff --git a/lib/fencing/Makefile.am b/lib/fencing/Makefile.am
index 778e5c4fba..e284058b7a 100644
--- a/lib/fencing/Makefile.am
+++ b/lib/fencing/Makefile.am
@@ -1,32 +1,32 @@
 #  File: Makefile.am
 #  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 #  Copyright (c) 2004 International Business Machines
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES         = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
                    -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl     \
 		   -I$(top_builddir)          -I$(top_srcdir)
 
 lib_LTLIBRARIES = libstonithd.la
 
 libstonithd_la_SOURCES = st_client.c
-libstonithd_la_LDFLAGS = -version-info 1:0:0
+libstonithd_la_LDFLAGS = -version-info 1:1:0
 libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la 	\
 			-lplumb -lstonith
 
 AM_CFLAGS = $(INCLUDES)
diff --git a/lib/pengine/Makefile.am b/lib/pengine/Makefile.am
index d4698b10d2..f140cab0df 100644
--- a/lib/pengine/Makefile.am
+++ b/lib/pengine/Makefile.am
@@ -1,41 +1,41 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
 
 ## libraries
 lib_LTLIBRARIES	= libpe_rules.la libpe_status.la
 
 ## SOURCES
 noinst_HEADERS	= unpack.h utils.h variant.h
 
 libpe_rules_la_LDFLAGS	= -version-info 2:0:0
 libpe_rules_la_SOURCES	= rules.c common.c
 
-libpe_status_la_LDFLAGS	= -version-info 3:0:0
+libpe_status_la_LDFLAGS	= -version-info 4:0:1
 libpe_status_la_SOURCES	=  status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
 libpe_status_la_LIBADD	= -llrm @CURSESLIBS@
 
 clean-generic:
 	rm -f *.log *.debug *~
 
 install-exec-local:
 
 uninstall-local:
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
index 6dc43b2da6..2ca91514b3 100644
--- a/pengine/Makefile.am
+++ b/pengine/Makefile.am
@@ -1,97 +1,97 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)           -I$(top_srcdir)		\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 PE_TESTS	= $(wildcard test10/*.scores)
 
 testdir			= $(datadir)/$(PACKAGE)/tests/pengine
 test_SCRIPTS		= regression.sh
 test_DATA		= regression.core.sh ptest.supp
 
 test10dir		= $(datadir)/$(PACKAGE)/tests/pengine/test10
 test10_DATA		= $(PE_TESTS) $(PE_TESTS:%.scores=%.xml) $(PE_TESTS:%.scores=%.exp) $(PE_TESTS:%.scores=%.dot)
 
 COMMONLIBS	= 					\
 		$(top_builddir)/lib/common/libcrmcommon.la		\
 		$(top_builddir)/lib/pengine/libpe_status.la		\
 		libpengine.la $(CURSESLIBS) $(CLUSTERLIBS) 
 
 ## libraries
 lib_LTLIBRARIES	= libpengine.la
 
 ## binary progs
 halib_PROGRAMS	= pengine
 sbin_PROGRAMS	= ptest
 
 man7_MANS =
 man8_MANS =
 
 if BUILD_HELP
 man8_MANS +=	ptest.8
 ptest.8:	ptest
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/pengine/$<
 endif
 
 if BUILD_XML_HELP
 man7_MANS +=	pengine.7
 
 pengine.xml:	pengine
 	$(top_builddir)/pengine/$< metadata | $(XSLTPROC) --nonet --novalid --stringparam man.name $< $(top_srcdir)/xml/ocf-meta2man.xsl - > $(top_builddir)/pengine/$@
 
 pengine.7:	pengine.xml
 	$(XSLTPROC) $(MANPAGE_XSLT) $(top_builddir)/pengine/$<
 endif
 
 ## SOURCES
 noinst_HEADERS	= allocate.h utils.h pengine.h
 #utils.h pengine.h
 
-libpengine_la_LDFLAGS	= -version-info 3:0:0
+libpengine_la_LDFLAGS	= -version-info 3:1:0
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
 libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c
 libpengine_la_SOURCES  += native.c group.c clone.c master.c graph.c
 
 libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
 	$(top_builddir)/lib/cib/libcib.la
 
 pengine_SOURCES	= main.c
 pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
 
 ptest_SOURCES	= ptest.c 
 ptest_LDADD	= $(top_builddir)/lib/cib/libcib.la			\
 		$(top_builddir)/lib/transition/libtransitioner.la	\
 		$(COMMONLIBS)
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
 	-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
 	-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
 	-chmod 750 $(DESTDIR)/$(PE_STATE_DIR)
 
 uninstall-local:
 
 clean-generic:
 	rm -f test10/*.pe.*