diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 22848255a..50060832e 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -681,6 +681,12 @@ class DsInstance(service.Service):
             except ipautil.CalledProcessError, e:
                 logging.critical("failed to delete user %s" % e)
 
+        # Make sure some upgrade-related state is removed. This could cause
+        # re-installation problems.
+        self.restore_state('nsslapd-port')
+        self.restore_state('nsslapd-security')
+        self.restore_state('nsslapd-ldapiautobind')
+
         if self.restore_state("running"):
             self.start()