diff --git a/Makefile.am b/Makefile.am
index 111ab7027a..dda9429f41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,197 +1,197 @@
 #
 # Pacemaker code
 #
 # 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.
 #
 
 EXTRA_DIST              = autogen.sh ConfigureMe README.in libltdl.tar
 
 RPM			= rpmbuild
 RPMFLAGS		= -ba
 TARFILE			= pacemaker.tar.gz
 AM_TAR			= tar
 LAST_RELEASE		= Pacemaker-1.0.2
 STABLE_SERIES		= stable-1.0
 
 BOMB_ADDRESS  = pacemaker@clusterlabs.org
 BOMB_STATUS  := $(shell $(HG) id -i | grep -c +)
 BOMB_LAST    := $(shell test -e .bomb && cat .bomb)
 BOMB_TARGET  := $(shell $(HG) id -i)
 BOMB_DATE    := $(shell python -c 'from time import *; print strftime ("%W, %Y", gmtime(time()))')
 BOMB_SUBJECT := Pacemaker $(VERSION) patch update for week $(BOMB_DATE)
 BOMB_ROOT    := $(shell $(HG) root 2>/dev/null)
 BOMB_VARIANT := $(shell basename $(BOMB_ROOT))
 BOMB_PROJECT := $(shell basename `dirname $(BOMB_ROOT)`)
 
 AUTOMAKE_OPTIONS	= foreign
 ##ACLOCAL                 = aclocal -I $(auxdir)
 
 PRETTY_ARGS		= --braces-on-if-line --braces-on-struct-decl-line --cuddle-do-while --cuddle-else --leave-preprocessor-space --blank-lines-after-declarations --blank-lines-after-procedures -sc --case-indentation4 --no-space-after-function-call-names --no-blank-lines-after-commas --procnames-start-lines --leave-optional-blank-lines --indent-level4 --line-length100 --break-before-boolean-operator --ignore-newlines --no-space-after-if --no-space-after-for --no-space-after-while --paren-indentation4
 
 MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
                         DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
 
 SUBDIRS	= debian build $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools xml cts extra doc
 
 tgz:
 	rm -f $(TARFILE)
 	$(HG) archive -X pengine/test06 -X pengine/test10 -t tgz $(TARFILE)
 	echo Rebuilt $(TARFILE) on `date`
 
 week:
 	$(HG) log -M --template "  + {desc|firstline|strip}\n" -d -7 | grep -v -e Dev: -e Low: | sort -u
 
 bomb-zero:
 	  echo $(BOMB_TARGET) > .bomb
 
 bomb-list:
 	echo Summary of `$(HG) log -M --template "{node|short}\n" -r $(BOMB_LAST):tip | wc -l` Pacemaker $(VERSION) patches from week $(BOMB_DATE)
 	echo ""
 	for cs in `$(HG) log -M --template "{node|short} " -r $(BOMB_LAST):tip`; do 					\
 		echo "http://hg.clusterlabs.org/$(BOMB_PROJECT)/$(BOMB_VARIANT)/rev/$$cs"; 				\
 		$(HG) log -M --template "by {author|user} on {date|shortdate}::\t{desc|firstline|strip}\n\n" -r $$cs;	\
 	done
 
 bomb:
 	if [ $(BOMB_STATUS) = 1 ]; then											\
 	  echo "Uncommitted changes exist";										\
 	elif [ -e .bomb -a "$(BOMB_TARGET)" != "$(BOMB_LAST)" ]; then 							\
 	  $(HG) email --config ui.interactive=false -i -g -d -t $(BOMB_ADDRESS) -s '$(BOMB_SUBJECT)' -r $(BOMB_LAST):tip;	\
 	  echo $(BOMB_TARGET) > .bomb;											\
 	elif [ ! -e .bomb ]; then											\
 	  echo "Initializing patch record";										\
 	  echo $(BOMB_TARGET) > .bomb;											\
 	else														\
 	  echo "No patches to send";											\
 	fi
 
 changes:
 	printf "$(PACKAGE) ($(VERSION)-1) stable; urgency=medium\n"
 	printf "  * Update source tarball to revision: `$(HG) id`\n"
 	printf "  * Statistics:\n"
 	printf "      Changesets: `$(HG) log -M --template "{desc|firstline|strip}\n" -r $(LAST_RELEASE):tip | wc -l`\n"
 	printf "      Diff:           "
 	$(HG) diff -r $(LAST_RELEASE):tip | diffstat | tail -n 1
 	printf "\n  * Testing Notes:\n"
 	printf "\n  + Test hardware:\n"
 	printf "\n  + All testing was performed with STONITH enabled\n"
 	printf "\n  + Pending bugs encountered during testing:\n"
 	printf "\n  * Changes since $(LAST_RELEASE)\n"
 	$(HG) log -M --template "  + {desc|firstline|strip}\n" -r $(LAST_RELEASE):tip | grep -v Low: | sort -uf 
 	printf "\n -- Andrew Beekhof <abeekhof@suse.de>  `date +"%a, %d %b %Y %T %z"`\n"
 
 features:
 	printf "$(PACKAGE) ($(VERSION)-1) unstable; urgency=medium\n"
 	printf "  * Update source tarball to revision: `$(HG) id`\n"
 	printf "  * Statistics:\n"
 	printf "      Changesets: `$(HG) out -M --template "{desc|firstline|strip}\n" ../$(STABLE_SERIES) | wc -l`\n"
 	printf "      Diff:           "
 	$(HG) out -M -p ../$(STABLE_SERIES) | diffstat | tail -n 1
 	printf "\n  * Changes added since $(STABLE_SERIES)\n"
 	$(HG) out -M --template "  + {desc|firstline|strip}\n" ../$(STABLE_SERIES) | grep -v Low: | sort -uf 
 	printf "\n -- Andrew Beekhof <abeekhof@suse.de>  `date +"%a, %d %b %Y %T %z"`\n"
 
 OBS_PROJECT	= pacemaker
 OBS_SERVER	= c001n16.suse.de
 OBS_PREFIX	= Development/obs
 OBS_FILES	= .changes $(TARFILE)
 
 stable:	tgz
 	make changes > .changes
 	scp $(OBS_FILES) $(OBS_SERVER):$(OBS_PREFIX)/server:ha-clustering/$(OBS_PROJECT)/
 
 unstable:	tgz
 	make changes > .changes
 	scp $(OBS_FILES) $(OBS_SERVER):$(OBS_PREFIX)/server:ha-clustering:UNSTABLE/$(OBS_PROJECT)/
 
 factory:	tgz
 	make changes > .changes
-	ssh $(OBS_SERVER) -- 'cd $(OBS_PREFIX)/home:beekhof/$(OBS_PROJECT) ; /usr/bin/osc up'
+	ssh $(OBS_SERVER) -- 'cd $(OBS_PREFIX)/server:ha-clustering:Factory/$(OBS_PROJECT) ; /usr/bin/osc up'
 	scp $(OBS_FILES) $(OBS_SERVER):$(OBS_PREFIX)/server:ha-clustering:Factory/$(OBS_PROJECT)/
-	ssh $(OBS_SERVER) -- "cd $(OBS_PREFIX)/home:beekhof/$(OBS_PROJECT); /usr/bin/osc commit -m \"New $(OBS_PROJECT) snapshot - $(shell $(HG) id)\""
+	ssh $(OBS_SERVER) -- "cd $(OBS_PREFIX)/server:ha-clustering:Factory/$(OBS_PROJECT); /usr/bin/osc commit -m \"New $(OBS_PROJECT) snapshot - $(shell $(HG) id)\""
 
 snap:	tgz
 	ssh $(OBS_SERVER) -- 'cd $(OBS_PREFIX)/home:beekhof/$(OBS_PROJECT) ; /usr/bin/osc up'
 	scp $(TARFILE) $(OBS_SERVER):$(OBS_PREFIX)/home:beekhof/$(OBS_PROJECT)/
 	ssh $(OBS_SERVER) -- "cd $(OBS_PREFIX)/home:beekhof/$(OBS_PROJECT); /usr/bin/osc commit -m \"New $(OBS_PROJECT) snapshot - $(shell $(HG) id)\""
 
 
 global: clean-generic
 	gtags -q
 
 global-html: global
 	htags -sanhIT
 
 global-www: global-html
 	rsync -avzxlSD --progress HTML/ root@clusterlabs.org:/var/lib/global/pacemaker
 
 pretty:
 	for file in `find . -name "*.c" | tr '\n' ' '`; do	\
 		gnuindent $(PRETTY_ARGS) $$file;		\
 	done
 
 rpmtgz: tgz
 	echo "Installing $(TARFILE) into /usr/src/packages/SOURCES for rpm"
 	-test -d /usr/src/packages/SOURCES && cp $(TARFILE) /usr/src/packages/SOURCES/
 	-test -d /usr/src/redhat/SOURCES && cp $(TARFILE) /usr/src/redhat/SOURCES/
 
 rpm:	rpmtgz
 	echo To make create custom builds, edit the flags and options in pacemaker.spec first
 	$(RPM) $(RPMFLAGS) $(top_srcdir)/pacemaker.spec </dev/null;
 
 drpm:	rpmtgz
 	echo To make create custom builds, edit the flags and options in pacemaker.spec first
 	$(RPM) --nodeps $(RPMFLAGS) $(top_srcdir)/pacemaker.spec </dev/null;
 
 deb:	
 	echo To make create custom builds, edit the configure flags in debian/rules first
 	dpkg-buildpackage -rfakeroot -us -uc 
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(HA_VARLIBDIR)/$(HB_PKG)/crm
 	-chown $(HA_CCMUSER) $(DESTDIR)/$(HA_VARLIBDIR)/$(HB_PKG)/crm
 	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(HA_VARLIBDIR)/$(HB_PKG)/crm
 	-chmod 750 $(DESTDIR)/$(HA_VARLIBDIR)/$(HB_PKG)/crm
 	$(mkinstalldirs) $(DESTDIR)/$(HA_VARRUNDIR)/$(HB_PKG)/crm
 	-chown $(HA_CCMUSER) $(DESTDIR)/$(HA_VARRUNDIR)/$(HB_PKG)/crm
 	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(HA_VARRUNDIR)/$(HB_PKG)/crm
 	-chmod 750 $(DESTDIR)/$(HA_VARRUNDIR)/$(HB_PKG)/crm
 	-test -d $(DESTDIR)$(LCRSODIR) || mkdir -p $(DESTDIR)$(LCRSODIR) 
 if BUILD_AIS_SUPPORT
 	rm -f $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso $(DESTDIR)$(LCRSODIR)/service_crm.so
 	cp $(DESTDIR)$(libdir)/service_crm.so $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso
 endif
 
 clean-generic:
 	find . -name ".gres.*" -exec rm \{\} \;
 	find . -name "*~" -exec rm \{\} \;
 
 dist-clean-local:
 	rm -f autoconf automake autoheader $(TARFILE)
 
 maintainer-clean-local:
 	rm -f libltdl.tar
 
 # "pkg" format for Solaris etc.
 pkg:
 		(cd build/pkg && $(MAKE) PWD=`pwd` pkg)
 
 # "port" format for BSD
 portfile:	dist
 		( cd build/port && $(MAKE) PWD=`pwd` portfile)
 
 .PHONY: rpm pkg handy handy-copy