diff --git a/farm.info b/farm.info
index c7757eabe..79f2cee02 100644
--- a/farm.info
+++ b/farm.info
@@ -38,6 +38,7 @@ dependencies[] = navbar
 dependencies[] = pathauto_entity
 
 ; Farm
+dependencies[] = farm_access
 dependencies[] = farm_constraint
 dependencies[] = farm_dashboard
 dependencies[] = farm_log
diff --git a/farm.install b/farm.install
index e6ba2da32..23ab369cf 100644
--- a/farm.install
+++ b/farm.install
@@ -74,7 +74,7 @@ function farm_install_configure_form($form, &$form_state) {
     'farm_crop_area_types' => t('Crop area types: Bed and Greenhouse'),
     'farm_livestock_area_types' => t('Livestock area types: Paddock'),
     'farm_water' => st('Water area type'),
-    'farm_access' => st('Default roles: Manager, Worker, Viewer'),
+    'farm_access_roles' => st('Default roles: Manager, Worker, Viewer'),
     'farm_help' => st('farmOS Help Pages'),
     'farm_tour' => st('farmOS Tours'),
     'farm_api' => st('farmOS API'),
diff --git a/modules/farm/farm_access/farm_access.farm_access.inc b/modules/farm/farm_access/farm_access.farm_access.inc
index 004541af1..9069f0c3b 100644
--- a/modules/farm/farm_access/farm_access.farm_access.inc
+++ b/modules/farm/farm_access/farm_access.farm_access.inc
@@ -4,38 +4,6 @@
  * Farm access hooks implemented by farm access module.
  */
 
-/**
- * Implements hook_farm_access_roles().
- */
-function farm_access_farm_access_roles() {
-
-  // Build a list of roles.
-  $roles = array(
-    'farm_manager' => array(
-      'name' => 'Farm Manager',
-      'access' => array(
-        'view' => 'all',
-        'edit' => 'all',
-        'config' => TRUE,
-      ),
-    ),
-    'farm_worker' => array(
-      'name' => 'Farm Worker',
-      'access' => array(
-        'view' => 'all',
-        'edit' => 'all',
-      ),
-    ),
-    'farm_viewer' => array(
-      'name' => 'Farm Viewer',
-      'access' => array(
-        'view' => 'all',
-      ),
-    ),
-  );
-  return $roles;
-}
-
 /**
  * Implements hook_farm_access_perms().
  *
diff --git a/modules/farm/farm_access/farm_access.install b/modules/farm/farm_access/farm_access.install
index 7de9d329b..fff8c6424 100644
--- a/modules/farm/farm_access/farm_access.install
+++ b/modules/farm/farm_access/farm_access.install
@@ -33,3 +33,13 @@ function farm_access_uninstall() {
     user_role_delete($name);
   }
 }
+
+/**
+ * Enable the Farm Access Roles module.
+ */
+function farm_access_update_7000(&$sandbox) {
+  $module = 'farm_access_roles';
+  if (!module_exists($module)) {
+    module_enable(array($module));
+  }
+}
diff --git a/modules/farm/farm_access/farm_access_roles/farm_access_roles.farm_access.inc b/modules/farm/farm_access/farm_access_roles/farm_access_roles.farm_access.inc
new file mode 100644
index 000000000..6c32540f8
--- /dev/null
+++ b/modules/farm/farm_access/farm_access_roles/farm_access_roles.farm_access.inc
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @file
+ * Farm access hooks implemented by farm access roles module.
+ */
+
+/**
+ * Implements hook_farm_access_roles().
+ */
+function farm_access_roles_farm_access_roles() {
+
+  // Build a list of roles.
+  $roles = array(
+    'farm_manager' => array(
+      'name' => 'Farm Manager',
+      'access' => array(
+        'view' => 'all',
+        'edit' => 'all',
+        'config' => TRUE,
+      ),
+    ),
+    'farm_worker' => array(
+      'name' => 'Farm Worker',
+      'access' => array(
+        'view' => 'all',
+        'edit' => 'all',
+      ),
+    ),
+    'farm_viewer' => array(
+      'name' => 'Farm Viewer',
+      'access' => array(
+        'view' => 'all',
+      ),
+    ),
+  );
+  return $roles;
+}
diff --git a/modules/farm/farm_access/farm_access_roles/farm_access_roles.info b/modules/farm/farm_access/farm_access_roles/farm_access_roles.info
new file mode 100644
index 000000000..a468d2482
--- /dev/null
+++ b/modules/farm/farm_access/farm_access_roles/farm_access_roles.info
@@ -0,0 +1,5 @@
+name = Farm Access Roles
+description = Provides default roles: Manager, Worker, Viewer.
+core = 7.x
+package = farmOS
+dependencies[] = farm_access
diff --git a/modules/farm/farm_access/farm_access_roles/farm_access_roles.module b/modules/farm/farm_access/farm_access_roles/farm_access_roles.module
new file mode 100644
index 000000000..5b03cca87
--- /dev/null
+++ b/modules/farm/farm_access/farm_access_roles/farm_access_roles.module
@@ -0,0 +1,5 @@
+<?php
+/**
+ * @file
+ * Farm Access Roles module.
+ */