diff --git a/lcgdm.spec b/lcgdm.spec
index 546e761..aa1efa1 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -35,15 +35,15 @@
 %endif
 
 Name:		lcgdm
-Version:	1.8.7
-Release:	5%{?dist}
+Version:	1.8.8
+Release:	1%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
 License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
-#		LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_7_3 lcgdm-1.8.7
-#		tar --exclude .svn -z -c -f lcgdm-1.8.7.tar.gz lcgdm-1.8.7
+#		LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_8 lcgdm-1.8.8
+#		tar --exclude .svn -z -c -f lcgdm-1.8.8.tar.gz lcgdm-1.8.8
 Source0:	%{name}-%{version}.tar.gz
 #		Systemd unit files
 Source1:	%{name}-unitfiles.tar.gz
@@ -108,6 +108,17 @@ components: the LFC (LCG File Catalog) and the DPM (Disk Pool Manager).
 Summary:	LCG Data Management common development files
 Group:		Development/Libraries
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+%if 0%{?el5}
+%ifarch %{ix86}
+Provides:   %{name}-devel(x86-32)
+%endif
+%ifnarch %{ix86} ppc ppc64 s390 s390x sparc sparc64
+# why doesn't ifarch x86_64 work?
+Provides:   %{name}-devel(x86-64)
+%endif
+%else
+Provides:   %{name}-devel%{?_isa}
+%endif
 
 %description devel
 This package contains common development libraries and header files
@@ -181,8 +192,8 @@ Requires:	lfc-libs%{?_isa} = %{version}-%{release}
 Requires:	python(abi) = 2.6
 %endif
 %if %{altpython} == python26
-Provides:	python26-dpm
-Obsoletes:	python26-dpm
+Provides:	python26-lfc
+Obsoletes:	python26-lfc
 %endif
 
 %description -n lfc-%{altpython}
@@ -227,7 +238,7 @@ Group:		Applications/Internet
 Requires:	lfcdaemon = %{version}-%{release}
 
 Requires(pre):		shadow-utils
-Requires(post):		finger
+Requires(post):         finger
 %if %systemd
 Requires(post):		systemd-units
 Requires(preun):	systemd-units
@@ -317,8 +328,8 @@ Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Requires:	python(abi) = 2.6
 %endif
 %if %{altpython} == python26
-Provides:	python26-lfc
-Obsoletes:	python26-lfc
+Provides:	python26-dpm
+Obsoletes:	python26-dpm
 %endif
 
 %description -n dpm-%{altpython}
@@ -333,6 +344,9 @@ Summary:	Disk Pool Manager (DPM) server with MySQL database back-end
 Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Requires:	finger%{?_isa}
+Requires:	MySQL-python
+Requires:	python-lxml
+Requires:	python-uuid
 Provides:	dpm-mysql = %{version}-%{release}
 Obsoletes:	dpm-mysql < 1.8.1.2-2
 Provides:	DPM-server-mysql = %{version}-%{release}
@@ -773,6 +787,10 @@ install -m 755 lfc-mysql/%{name}-%{version}/scripts/upgrades/*.pm ${RPM_BUILD_RO
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/upgrades/cns-db* ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/upgrades
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/upgrades/dpm-db* ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/upgrades
 
+# Add the star accounting script
+mkdir ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/scripts
+install -m 755 lfc-mysql/%{name}-%{version}/scripts/StAR-accounting/star-accounting.py ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/scripts
+
 # Add the LFC info provider script
 mkdir ${RPM_BUILD_ROOT}%{_libexecdir}
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/lcg-info-provider-lfc ${RPM_BUILD_ROOT}%{_libexecdir}
@@ -824,13 +842,13 @@ fi
   --slave %{_mandir}/man8/lfc-shutdown.8.gz lfc-shutdown.8.gz \
 	  %{_libdir}/lfc-mysql/lfc-shutdown.8.gz
 
-if [ $1 -eq 1 ]; then
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+%systemd_post lfcdaemon.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add lfcdaemon
-%endif
 fi
+%endif
 
 %preun -n lfc-server-mysql
 export LANG=C
@@ -839,9 +857,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display lfcdaemon | \
 	grep currently | grep -q lfc-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable lfcdaemon.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop lfcdaemon.service > /dev/null 2>&1 || :
+	%systemd_preun lfcdaemon.service
 %else
 	/sbin/service lfcdaemon stop > /dev/null 2>&1 || :
 %endif
@@ -861,7 +877,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display lfcdaemon | \
 	grep currently | grep -q lfc-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart lfcdaemon.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart lfcdaemon.service
 %else
 	/sbin/service lfcdaemon condrestart > /dev/null 2>&1 || :
 %endif
@@ -877,33 +893,32 @@ if [ -r %{_initrddir}/lfc-dli ] ; then
 fi
 %endif
 
-if [ $1 -eq 1 ]; then
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+%systemd_post lfc-dli.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add lfc-dli
-%endif
 fi
+%endif
 
 %preun -n lfc-dli
-if [ $1 -eq 0 ]; then
 %if %systemd
-    /bin/systemctl --no-reload disable lfc-dli.service > /dev/null 2>&1 || :
-    /bin/systemctl stop lfc-dli.service > /dev/null 2>&1 || :
+%systemd_preun lfc-dli.service
 %else
+if [ $1 -eq 0 ]; then
     /sbin/service lfc-dli stop > /dev/null 2>&1 || :
     /sbin/chkconfig --del lfc-dli
-%endif
 fi
+%endif
 
 %postun -n lfc-dli
-if [ $1 -ge 1 ]; then
 %if %systemd
-    /bin/systemctl try-restart lfc-dli.service > /dev/null 2>&1 || :
+    %systemd_postun_with_restart lfc-dli.service
 %else
+if [ $1 -ge 1 ]; then
     /sbin/service lfc-dli condrestart > /dev/null 2>&1 || :
-%endif
 fi
+%endif
 
 %post -n dpm-server-mysql
 %if %systemd
@@ -940,13 +955,13 @@ fi
   --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
 	  %{_libdir}/dpm-mysql/dpm-buildfsv.8.gz
 
-if [ $1 -eq 1 ]; then
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+    %systemd_post dpm.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add dpm
-%endif
 fi
+%endif
 
 %preun -n dpm-server-mysql
 export LANG=C
@@ -955,9 +970,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display dpm | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable dpm.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm.service > /dev/null 2>&1 || :
+	%systemd_preun dpm.service
 %else
 	/sbin/service dpm stop > /dev/null 2>&1 || :
 %endif
@@ -977,7 +990,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display dpm | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart dpm.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart dpm.service
 %else
 	/sbin/service dpm condrestart > /dev/null 2>&1 || :
 %endif
@@ -1015,13 +1028,13 @@ fi
   --slave %{_mandir}/man8/dpns-shutdown.8.gz dpns-shutdown.8.gz \
 	  %{_libdir}/dpm-mysql/dpns-shutdown.8.gz
 
-if [ $1 -eq 1 ]; then
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+    %systemd_post dpnsdaemon.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add dpnsdaemon
-%endif
 fi
+%endif
 
 %preun -n dpm-name-server-mysql
 export LANG=C
@@ -1030,9 +1043,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display dpnsdaemon | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable dpnsdaemon.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpnsdaemon.service > /dev/null 2>&1 || :
+	%systemd_preun dpnsdaemon.service
 %else
 	/sbin/service dpnsdaemon stop > /dev/null 2>&1 || :
 %endif
@@ -1052,7 +1063,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display dpnsdaemon | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart dpnsdaemon.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart dpnsdaemon.service
 %else
 	/sbin/service dpnsdaemon condrestart > /dev/null 2>&1 || :
 %endif
@@ -1084,13 +1095,13 @@ fi
   --slave %{_sysconfdir}/logrotate.d/dpmcopyd dpmcopyd.logrotate \
 	  %{_sysconfdir}/dpm-mysql/dpmcopyd.logrotate
 
-if [ $1 -eq 1 ]; then
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+    %systemd_post dpmcopyd.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add dpmcopyd
-%endif
 fi
+%endif
 
 %preun -n dpm-copy-server-mysql
 export LANG=C
@@ -1099,9 +1110,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display dpmcopyd | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable dpmcopyd.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpmcopyd.service > /dev/null 2>&1 || :
+	%systemd_preun dpmcopyd.service
 %else
 	/sbin/service dpmcopyd stop > /dev/null 2>&1 || :
 %endif
@@ -1121,7 +1130,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display dpmcopyd | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart dpmcopyd.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart dpmcopyd.service
 %else
 	/sbin/service dpmcopyd condrestart > /dev/null 2>&1 || :
 %endif
@@ -1193,15 +1202,18 @@ fi
   --slave %{_sysconfdir}/logrotate.d/srmv2.2 srmv2.2.logrotate \
 	  %{_sysconfdir}/dpm-mysql/srmv2.2.logrotate
 
-if [ $1 -eq 1 ]; then
+
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+    %systemd_post srmv1.service
+    %systemd_post srmv2.service
+    %systemd_post srmv2.2.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add srmv1
     /sbin/chkconfig --add srmv2
     /sbin/chkconfig --add srmv2.2
-%endif
 fi
+%endif
 
 %preun -n dpm-srm-server-mysql
 export LANG=C
@@ -1210,9 +1222,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display srmv1 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable srmv1.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop srmv1.service > /dev/null 2>&1 || :
+	%systemd_preun srmv1.service
 %else
 	/sbin/service srmv1 stop > /dev/null 2>&1 || :
 %endif
@@ -1227,9 +1237,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display srmv2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable srmv2.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop srmv2.service > /dev/null 2>&1 || :
+	%systemd_preun srmv2.service
 %else
 	/sbin/service srmv2 stop > /dev/null 2>&1 || :
 %endif
@@ -1244,9 +1252,7 @@ if [ $1 -eq 0 ]; then
     if ( %{_sbindir}/update-alternatives --display srmv2.2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable srmv2.2.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop srmv2.2.service > /dev/null 2>&1 || :
+	%systemd_preun srmv2.2.service
 %else
 	/sbin/service srmv2.2 stop > /dev/null 2>&1 || :
 %endif
@@ -1266,7 +1272,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display srmv1 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart srmv1.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart srmv1.service
 %else
 	/sbin/service srmv1 condrestart > /dev/null 2>&1 || :
 %endif
@@ -1275,7 +1281,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display srmv2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart srmv2.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart srmv2.service
 %else
 	/sbin/service srmv2 condrestart > /dev/null 2>&1 || :
 %endif
@@ -1284,7 +1290,7 @@ if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display srmv2.2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart srmv2.2.service > /dev/null 2>&1 || :
+	%systemd_postun_with_restart srmv2.2.service
 %else
 	/sbin/service srmv2.2 condrestart > /dev/null 2>&1 || :
 %endif
@@ -1300,19 +1306,18 @@ if [ -r %{_initrddir}/rfiod ] ; then
 fi
 %endif
 
-if [ $1 -eq 1 ]; then
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+%systemd_post rfiod.service
 %else
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add rfiod
-%endif
 fi
+%endif
 
 %preun -n dpm-rfio-server
 if [ $1 -eq 0 ]; then
 %if %systemd
-    /bin/systemctl --no-reload disable rfiod.service > /dev/null 2>&1 || :
-    /bin/systemctl stop rfiod.service > /dev/null 2>&1 || :
+    %systemd_preun rfiod.service
 %else
     /sbin/service rfiod stop > /dev/null 2>&1 || :
     /sbin/chkconfig --del rfiod
@@ -1322,7 +1327,7 @@ fi
 %postun -n dpm-rfio-server
 if [ $1 -ge 1 ]; then
 %if %systemd
-    /bin/systemctl try-restart rfiod.service > /dev/null 2>&1 || :
+    %systemd_postun_with_restart rfiod.service
 %else
     /sbin/service rfiod condrestart > /dev/null 2>&1 || :
 %endif
@@ -1427,6 +1432,7 @@ fi
 %config(noreplace) %{_sysconfdir}/lfc-mysql/lfcdaemon.logrotate
 %ghost %{_sysconfdir}/logrotate.d/lfcdaemon
 %doc %{_datadir}/lcgdm/create_lfc_tables_mysql.sql
+%{_datadir}/lcgdm/upgrades/cns-db-*
 
 %files -n lfc-dli
 %defattr(-,root,root,-)
@@ -1452,6 +1458,7 @@ fi
 %doc %{_mandir}/man3/dpm_[a-o]*.3*
 %doc %{_mandir}/man3/dpm_ping.3*
 %doc %{_mandir}/man3/dpm_put.3*
+%doc %{_mandir}/man3/dpm_putx.3*
 %doc %{_mandir}/man3/dpm_putdone.3*
 %doc %{_mandir}/man3/dpm_[q-z]*.3*
 %doc %{_mandir}/man3/dpns_*.3*
@@ -1528,6 +1535,7 @@ fi
 %ghost %{_sysconfdir}/logrotate.d/dpm
 %{_datadir}/lcgdm/create_dpm_tables_mysql.sql
 %{_datadir}/lcgdm/upgrades/dpm-db-*
+%{_datadir}/lcgdm/scripts/*
 
 %files -n dpm-name-server-mysql
 %defattr(-,root,root,-)
@@ -1631,6 +1639,18 @@ fi
 %doc %{_mandir}/man8/rfiod.8*
 
 %changelog
+* Wed Mar 12 2014 Alejandro Alvarez <aalvarez@cern.ch> - 1.8.8-1
+- Update for new upstream release
+
+* Mon Dec 02 2013 Alejandro Alvarez <aalvarez@cern.ch> - 1.8.7-8
+- Packaging star-accounting.py
+
+* Thu Oct 17 2013 Alejandro Alvarez <aalvarez@cern.ch> - 1.8.7-7
+- Rebuilt for new libgsoap
+
+* Fri Aug 30 2013 Alejandro Alvarez <aalvarez@cern.ch> - 1.8.7-6
+- Introduce systemd-rpm macros
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index a8bd677..f9a40e3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 942ef9000ca258909a7bbad439c82610  lcgdm-1.8.7.tar.gz
 5697217008737c454673c86deb3f03d5  lcgdm-unitfiles.tar.gz
+9b587576d52b7ab2e94b94877ee8efc0  lcgdm-1.8.8.tar.gz