diff --git a/debian/openerp.postrm b/debian/openerp.postrm
index 55c28f04eb5..bc81ce98b71 100644
--- a/debian/openerp.postrm
+++ b/debian/openerp.postrm
@@ -6,10 +6,11 @@ case "${1}" in
     remove)
         deluser --quiet --system "openerp" || true
         delgroup --quiet --system --only-if-empty "openerp" || true
+        find /var/lib/openerp -path '/var/lib/openerp/*' ! -path '/var/lib/openerp/filestore*' -delete
         ;;
 
     purge)
-        rm -rf /var/lib/openerp-server
+        rm -rf /var/lib/openerp
         ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)