diff --git a/.gitignore b/.gitignore
index 2adce00..4b399e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bdii-5.1.13.tar.gz
+/bdii-5.2.3.tar.gz
diff --git a/bdii-context.patch b/bdii-context.patch
deleted file mode 100644
index 46e9e99..0000000
--- a/bdii-context.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur bdii-5.1.13.orig/etc/init.d/bdii bdii-5.1.13/etc/init.d/bdii
---- bdii-5.1.13.orig/etc/init.d/bdii	2011-01-01 09:23:46.978614971 +0100
-+++ bdii-5.1.13/etc/init.d/bdii	2011-01-01 11:44:25.771892868 +0100
-@@ -90,6 +90,7 @@
-     mkdir -p ${BDII_VAR_DIR}/archive
-     mkdir -p /var/lock/subsys
-     chown -R ${BDII_USER}:${BDII_USER} ${BDII_VAR_DIR}
-+    [ -x /sbin/restorecon ] && /sbin/restorecon -R ${BDII_VAR_DIR}
-     chown -R ${BDII_USER}:${BDII_USER} ${SLAPD_DB_DIR}
-     $RUNUSER -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/stats/* 2>/dev/null"
-     $RUNUSER -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/glue2/* 2>/dev/null"
diff --git a/bdii-default.patch b/bdii-default.patch
deleted file mode 100644
index 2167ef3..0000000
--- a/bdii-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur bdii-5.1.13.orig/etc/init.d/bdii bdii-5.1.13/etc/init.d/bdii
---- bdii-5.1.13.orig/etc/init.d/bdii	2011-01-01 09:23:46.000000000 +0100
-+++ bdii-5.1.13/etc/init.d/bdii	2011-01-02 01:18:31.000000000 +0100
-@@ -10,7 +10,8 @@
- # Provides:          bdii
- # Required-Start:    $remote_fs $syslog
- # Required-Stop:     $remote_fs $syslog
--# Default-Stop:      0 1 2 3 4 5 6
-+# Default-Start:     2 3 4 5
-+# Default-Stop:      0 1 6
- # Short-Description: BDII
- # Description:       Berkeley Database Information Index
- ### END INIT INFO
diff --git a/bdii-runuser.patch b/bdii-runuser.patch
deleted file mode 100644
index 62835b1..0000000
--- a/bdii-runuser.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ur bdii-5.1.13.orig/etc/init.d/bdii bdii-5.1.13/etc/init.d/bdii
---- bdii-5.1.13.orig/etc/init.d/bdii	2011-01-01 09:23:46.978614971 +0100
-+++ bdii-5.1.13/etc/init.d/bdii	2011-01-01 16:22:50.390658702 +0100
-@@ -61,6 +61,12 @@
- SLAPD_PID_FILE=${SLAPD_PID_FILE:-$SLAPD_DB_DIR/slapd.pid}
- DB_CONFIG=${DB_CONFIG:-/etc/bdii/DB_CONFIG}
- 
-+if [ -x /sbin/runuser ] ; then
-+    RUNUSER=runuser
-+else
-+    RUNUSER=su
-+fi
-+
- function start(){
- 
-     # Check status
-@@ -91,13 +97,13 @@
-     mkdir -p /var/lock/subsys
-     chown -R ${BDII_USER}:${BDII_USER} ${BDII_VAR_DIR}
-     chown -R ${BDII_USER}:${BDII_USER} ${SLAPD_DB_DIR}
--    runuser -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/stats/* 2>/dev/null"
--    runuser -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/glue2/* 2>/dev/null"
--    runuser -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/* 2>/dev/null"
--    runuser -s /bin/sh ${BDII_USER} -c "rm -f ${BDII_VAR_DIR}/old.ldif 2>/dev/null"
--    runuser -s /bin/sh ${BDII_USER} -c "cp ${DB_CONFIG} ${SLAPD_DB_DIR}"
--    runuser -s /bin/sh ${BDII_USER} -c "cp ${DB_CONFIG} ${SLAPD_DB_DIR}/stats/"
--    runuser -s /bin/sh ${BDII_USER} -c "cp ${DB_CONFIG} ${SLAPD_DB_DIR}/glue2/"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/stats/* 2>/dev/null"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/glue2/* 2>/dev/null"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "rm -f ${SLAPD_DB_DIR}/* 2>/dev/null"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "rm -f ${BDII_VAR_DIR}/old.ldif 2>/dev/null"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "cp ${DB_CONFIG} ${SLAPD_DB_DIR}"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "cp ${DB_CONFIG} ${SLAPD_DB_DIR}/stats/"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "cp ${DB_CONFIG} ${SLAPD_DB_DIR}/glue2/"
- 
-     echo -n "Starting BDII slapd: "
-     COMMAND="${SLAPD} -f ${SLAPD_CONF} -h ldap://$(hostname -f):${SLAPD_PORT} -u ${BDII_USER}"
-@@ -127,7 +133,7 @@
-     fi
- 
-     export SLAPD_CONF=${SLAPD_CONF}
--    runuser -s /bin/sh ${BDII_USER} -c "${BDII_UPDATE} -c ${BDII_CONF} -d"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "${BDII_UPDATE} -c ${BDII_CONF} -d"
-     touch ${UPDATE_LOCK_FILE}
- 
-     if [ ! -f ${BDII_VAR_DIR}/bdii-update.pid ]; then
-@@ -179,14 +185,14 @@
-         UPDATE_PID=$(cat ${UPDATE_PID_FILE})
-     fi
- 
--    runuser -s /bin/sh ${BDII_USER} -c "kill -15 ${UPDATE_PID} 2>/dev/null"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "kill -15 ${UPDATE_PID} 2>/dev/null"
-     if [ -n "${UPDATE_PID}" ]; then
-         ps ${UPDATE_PID} >/dev/null 2>&1
-         if [ $? = 0 ]; then
-             sleep 2
-             ps ${UPDATE_PID} >/dev/null 2>&1
-             if [ $? = 0 ]; then
--                runuser -s /bin/sh ${BDII_USER} -c "kill -9 ${UPDATE_PID} 2>/dev/null"
-+                $RUNUSER -s /bin/sh ${BDII_USER} -c "kill -9 ${UPDATE_PID} 2>/dev/null"
-                 sleep 2
-                 ps ${UPDATE_PID} >/dev/null 2>&1
-                 if [ $? = 0 ]; then
-@@ -211,14 +217,14 @@
-         SLAPD_PID=$(cat ${SLAPD_PID_FILE})
-     fi
- 
--    runuser -s /bin/sh ${BDII_USER} -c "kill -15 ${SLAPD_PID} 2>/dev/null"
-+    $RUNUSER -s /bin/sh ${BDII_USER} -c "kill -15 ${SLAPD_PID} 2>/dev/null"
-     if [ -n "${SLAPD_PID}" ]; then
-         ps ${SLAPD_PID} >/dev/null 2>&1
-         if [ $? = 0 ]; then
-             sleep 2
-             ps ${SLAPD_PID} >/dev/null 2>&1
-             if [ $? = 0 ]; then
--                runuser -s /bin/sh ${BDII_USER} -c "kill -9 ${SLAPD_PID} 2>/dev/null"
-+                $RUNUSER -s /bin/sh ${BDII_USER} -c "kill -9 ${SLAPD_PID} 2>/dev/null"
-                 sleep 2
-                 ps ${SLAPD_PID} >/dev/null 2>&1
-                 if [ $? = 0 ]; then
diff --git a/bdii-shadowerr.patch b/bdii-shadowerr.patch
deleted file mode 100644
index 39a235f..0000000
--- a/bdii-shadowerr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur bdii-5.1.13.orig/bin/bdii-update bdii-5.1.13/bin/bdii-update
---- bdii-5.1.13.orig/bin/bdii-update	2011-01-01 09:23:46.000000000 +0100
-+++ bdii-5.1.13/bin/bdii-update	2011-01-02 11:58:38.000000000 +0100
-@@ -291,7 +291,7 @@
-             else:
-                 if "o=shadow" in config['BDII_PASSWD'] and root == "o=grid":
-                     grouped[root] = [ dn ]
--                else:
-+                elif root != "o=shadow":
-                     log.error("dn suffix %s in not specified in the slapd configuration file." % (root))
- 
- 
diff --git a/bdii-sysconfig.patch b/bdii-sysconfig.patch
deleted file mode 100644
index c3338ee..0000000
--- a/bdii-sysconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur bdii-5.1.13.orig/etc/bdii.conf bdii-5.1.13/etc/bdii.conf
---- bdii-5.1.13.orig/etc/bdii.conf	2011-01-01 09:23:46.000000000 +0100
-+++ bdii-5.1.13/etc/bdii.conf	2011-01-02 11:32:45.000000000 +0100
-@@ -9,4 +9,4 @@
- BDII_ARCHIVE_SIZE=0
- BDII_USER=ldap
- BDII_VAR_DIR=/var/run/bdii
--FIX_GLUE=yes
-\ No newline at end of file
-+FIX_GLUE=yes
-diff -ur bdii-5.1.13.orig/etc/sysconfig/bdii bdii-5.1.13/etc/sysconfig/bdii
---- bdii-5.1.13.orig/etc/sysconfig/bdii	2011-01-01 09:23:46.000000000 +0100
-+++ bdii-5.1.13/etc/sysconfig/bdii	2011-01-02 11:32:01.000000000 +0100
-@@ -1,3 +1,3 @@
--#SLAPD_CONF=/etc/bdii/bdii-top-slapd.conf
--#SLAPD=/usr/sbin/slapd2.4
--#BDII_RAM_DISK=yes
-\ No newline at end of file
-+#SLAPD_CONF=/etc/bdii/bdii-slapd.conf
-+#SLAPD=/usr/sbin/slapd
-+#BDII_RAM_DISK=no
diff --git a/bdii.spec b/bdii.spec
index 83556ed..d583fe2 100644
--- a/bdii.spec
+++ b/bdii.spec
@@ -1,32 +1,17 @@
 Name:		bdii
-Version:	5.1.13
-Release:	2%{?dist}
+Version:	5.2.3
+Release:	1%{?dist}
 Summary:	The Berkeley Database Information Index (BDII)
 
 Group:		System Environment/Daemons
 License:	ASL 2.0
 URL:		https://twiki.cern.ch/twiki/bin/view/EGEE/BDII
 #		The source tarball is created from a svn checkout:
-#		svn co http://svnweb.cern.ch/guest/gridinfo/bdii/tags/R_5_1_13 bdii-5.1.13
-#		tar -z -c --exclude .svn -f bdii-5.1.13.tar.gz bdii-5.1.13
+#		svn co http://svnweb.cern.ch/guest/gridinfo/bdii/tags/R_5_2_3 bdii-5.2.3
+#		tar -z -c --exclude .svn -f bdii-5.2.3.tar.gz bdii-5.2.3
 Source:		%{name}-%{version}.tar.gz
 #		Remove lsb dependency
 Patch0:		%{name}-init.patch
-#		Fallback to su when runuser is absent
-#		https://gus.fzk.de/ws/ticket_info.php?ticket=65796
-Patch1:		%{name}-runuser.patch
-#		Restore context on /var/run/bdii
-#		https://gus.fzk.de/ws/ticket_info.php?ticket=65794
-Patch2:		%{name}-context.patch
-#		Make runlevels consistent
-#		https://gus.fzk.de/ws/ticket_info.php?ticket=65795
-Patch3:		%{name}-default.patch
-#		Silence bogus error in logfile
-#		https://gus.fzk.de/ws/ticket_info.php?ticket=65797
-Patch4:		%{name}-shadowerr.patch
-#		Document defaults properly
-#		https://gus.fzk.de/ws/ticket_info.php?ticket=65798
-Patch5:		%{name}-sysconfig.patch
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 
@@ -60,15 +45,8 @@ differences. This is then used to update the database.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
-# Fix install paths
-sed -e 's!/opt/glite/etc!/var/lib/bdii!g' -e 's!/opt/bdii/etc!/etc/bdii!' \
-    -i Makefile etc/bdii.conf etc/init.d/bdii etc/cron.d/bdii-proxy
+sed 's!/opt/bdii/etc/bdii.conf!/etc/bdii/bdii.conf!' -i etc/init.d/bdii
 
 %build
 # Nothing to build
@@ -145,6 +123,11 @@ fi
 %doc copyright
 
 %changelog
+* Mon Jun 13 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.2.3-1
+- New upstream version 5.2.3
+- Drop patches accepted upstream: bdii-runuser.patch, bdii-context.patch,
+  bdii-default.patch, bdii-shadowerr.patch, bdii-sysconfig.patch
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e2cde9c..7a4ac8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1e90f9d4967f0ce50037f3387bff5cb  bdii-5.1.13.tar.gz
+46dd0d7433cf7cf3957c22e50b28d720  bdii-5.2.3.tar.gz