diff --git a/contrib/wiki/main.php b/contrib/wiki/main.php
index f289f04d..bb2f4837 100644
--- a/contrib/wiki/main.php
+++ b/contrib/wiki/main.php
@@ -167,13 +167,6 @@ class Wiki extends Extension {
 		}
 	}
 
-	public function onSetupBuilding(SetupBuildingEvent $event) {
-		$sb = new SetupBlock("Wiki");
-		$sb->add_bool_option("wiki_edit_anon", "Allow anonymous edits: ");
-		$sb->add_bool_option("wiki_edit_user", "<br>Allow user edits: ");
-		$event->panel->add_block($sb);
-	}
-
 	/**
 	 * See if the given user is allowed to edit the given page
 	 *
@@ -189,8 +182,7 @@ class Wiki extends Extension {
 		if($page->is_locked()) return false;
 
 		// anon / user can edit if allowed by config
-		if($config->get_bool("wiki_edit_anon", false) && $user->is_anonymous()) return true;
-		if($config->get_bool("wiki_edit_user", false) && !$user->is_anonymous()) return true;
+		if($user->can("edit_wiki_page")) return true;
 
 		return false;
 	}
diff --git a/core/userclass.class.php b/core/userclass.class.php
index 9d91bce9..efc1d22d 100644
--- a/core/userclass.class.php
+++ b/core/userclass.class.php
@@ -68,6 +68,9 @@ new UserClass("base", null, array(
 	"create_image_report" => False,
 	"view_image_report" => False,  # deal with reported images
 
+	"edit_wiki_page" => False,
+	"delete_wiki_page" => False,
+
 	"protected" => False,          # only admins can modify protected users (stops a moderator changing an admin's password)
 ));
 
@@ -106,6 +109,8 @@ new UserClass("admin", "base", array(
 	"mass_tag_edit" => True,
 	"create_image_report" => True,
 	"view_image_report" => True,
+	"edit_wiki_page" => True,
+	"delete_wiki_page" => True,
 	"protected" => True,
 ));