diff --git a/mod/folder/db/access.php b/mod/folder/db/access.php
index 59bee5c3ddf..3befbf25759 100644
--- a/mod/folder/db/access.php
+++ b/mod/folder/db/access.php
@@ -35,5 +35,14 @@ $capabilities = array(
         )
     ),*/
 
+    // can manage files in the folder
+    'mod/folder:managefiles' => array(
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_MODULE,
+        'archetypes' => array(
+            'editingteacher' => CAP_ALLOW
+        )
+    )
 );
 
diff --git a/mod/folder/edit.php b/mod/folder/edit.php
index 1df5c123d8c..e0cd67d0520 100644
--- a/mod/folder/edit.php
+++ b/mod/folder/edit.php
@@ -36,7 +36,7 @@ $folder = $DB->get_record('folder', array('id'=>$cm->instance), '*', MUST_EXIST)
 $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_login($course, false, $cm);
-require_capability('moodle/course:managefiles', $context);
+require_capability('mod/folder:managefiles', $context);
 
 add_to_log($course->id, 'folder', 'edit', 'edit.php?id='.$cm->id, $folder->id, $cm->id);
 
diff --git a/mod/folder/lang/en/folder.php b/mod/folder/lang/en/folder.php
index d55843fb111..f06f78a0990 100644
--- a/mod/folder/lang/en/folder.php
+++ b/mod/folder/lang/en/folder.php
@@ -24,6 +24,7 @@
  */
 
 $string['contentheader'] = 'Content';
+$string['folder:managefiles'] = 'Manage files in folder module';
 $string['folderadministration'] = 'Folder administration';
 $string['foldercontent'] = 'Files and subfolders';
 $string['modulename'] = 'Folder';
diff --git a/mod/folder/version.php b/mod/folder/version.php
index 32031702eb4..bc17f077173 100644
--- a/mod/folder/version.php
+++ b/mod/folder/version.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$module->version  = 2009080500;
+$module->version  = 2010072200;
 $module->requires = 2009073101;  // Requires this Moodle version
 $module->cron     = 0;
 
diff --git a/mod/folder/view.php b/mod/folder/view.php
index 3e8c846a805..117ba31d1b3 100644
--- a/mod/folder/view.php
+++ b/mod/folder/view.php
@@ -74,7 +74,7 @@ echo $output->box_start('generalbox foldertree');
 echo $output->folder_tree($folder, $cm, $course);
 echo $output->box_end();
 
-if (has_capability('moodle/course:managefiles', $context)) {
+if (has_capability('mod/folder:managefiles', $context)) {
     echo $output->container_start('mdl-align');
     echo $output->single_button(new moodle_url('/mod/folder/edit.php', array('id'=>$id)), get_string('edit'));
     echo $output->container_end();