diff --git a/doc/changelog.txt b/doc/changelog.txt
index 0308fea..b75fb0b 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,7 @@
 - build: support for Linux 2.6.31-rc1
 - quota2: support anonymous counters
 - quota2: reduce memory footprint for anonymous counters
+- quota2: extend locked period during cleanup (locking bugfix)
 
 
 Xtables-addons 1.17 (June 16 2009)
diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c
index 4fa04b9..346ac4f 100644
--- a/extensions/xt_quota2.c
+++ b/extensions/xt_quota2.c
@@ -185,8 +185,8 @@ static void quota_mt2_destroy(const struct xt_mtdtor_param *par)
 	}
 
 	list_del(&e->list);
-	spin_unlock_bh(&counter_list_lock);
 	remove_proc_entry(e->name, proc_xt_quota);
+	spin_unlock_bh(&counter_list_lock);
 	kfree(e);
 }