diff --git a/.gitignore b/.gitignore
index 3903a41..a8cee69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ corosync-1.2.7.tar.gz
 /corosync-1.4.1.tar.gz
 /corosync-1.4.2.tar.gz
 /corosync-1.99.1.tar.gz
+/corosync-1.99.2.tar.gz
diff --git a/corosync.spec b/corosync.spec
index 26678b3..1023b10 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -12,12 +12,12 @@
 %endif
 %bcond_without systemd
 %bcond_without nss
-%bcond_with xmlconf
+%bcond_without xmlconf
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 1.99.1
-Release: 2%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Version: 1.99.2
+Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://ftp.corosync.org
@@ -119,6 +119,11 @@ mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
 install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
+%if %{with systemd}
+mkdir -p %{buildroot}/%{_unitdir}/
+mv %{buildroot}/lib/systemd/system/*.service %{buildroot}/%{_unitdir}/
+%endif
+
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
@@ -158,6 +163,11 @@ fi
 %{_bindir}/corosync-blackbox
 %if %{with xmlconf}
 %{_bindir}/corosync-xmlproc
+%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
+%dir %{_datadir}/corosync
+%dir %{_datadir}/corosync/xml2conf.xsl
+%{_mandir}/man8/corosync-xmlproc.8*
+%{_mandir}/man5/corosync.xml.5*
 %endif
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
@@ -290,17 +300,25 @@ The Corosync Cluster Engine APIs.
 %{_libdir}/libpload.so
 %{_libdir}/libsam.so
 %{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/cmap_*3*
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*
 %{_mandir}/man3/quorum_*3*
 %{_mandir}/man3/votequorum_*3*
 %{_mandir}/man3/sam_*3*
+%{_mandir}/man8/cmap_overview.8*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/evs_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
 %{_mandir}/man8/sam_overview.8*
 
 %changelog
+* Tue Feb  7 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.99.2-1
+- New upstream release
+- Re-enable xmlconfig bits
+- Ship cmap man pages
+- Add workaround to usrmove breakage!!
+
 * Thu Feb  2 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.99.1-2
 - Add proper Obsoltes on openais/cman/clusterlib
 
diff --git a/sources b/sources
index 65759d4..6459375 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4bfd60d967cfa05a12d369c446aa415  corosync-1.99.1.tar.gz
+a42f6529c393dd93d8b6e92346ebad92  corosync-1.99.2.tar.gz