diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
index 509b39940..fc29ce7c6 100644
--- a/src/defaultPlugins.js
+++ b/src/defaultPlugins.js
@@ -1,3 +1,4 @@
+import cursor from './plugins/cursor'
 import display from './plugins/display'
 import flexbox from './plugins/flexbox'
 import float from './plugins/float'
@@ -38,6 +39,7 @@ import zIndex from './plugins/zIndex'
 
 export default function (config) {
   return [
+    config.modules.cursor === false ? () => {} : cursor(),
     config.modules.display === false ? () => {} : display(),
     config.modules.flexbox === false ? () => {} : flexbox(),
     config.modules.float === false ? () => {} : float(),
diff --git a/src/generators/cursor.js b/src/generators/cursor.js
deleted file mode 100644
index b2eda2ab2..000000000
--- a/src/generators/cursor.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import defineClasses from '../util/defineClasses'
-
-export default function() {
-  return defineClasses({
-    'cursor-auto': { cursor: 'auto' },
-    'cursor-default': { cursor: 'default' },
-    'cursor-pointer': { cursor: 'pointer' },
-    'cursor-wait': { cursor: 'wait' },
-    'cursor-move': { cursor: 'move' },
-    'cursor-not-allowed': { cursor: 'not-allowed' },
-  })
-}
diff --git a/src/plugins/cursor.js b/src/plugins/cursor.js
new file mode 100644
index 000000000..35a74d16a
--- /dev/null
+++ b/src/plugins/cursor.js
@@ -0,0 +1,12 @@
+export default function () {
+  return function ({ addUtilities, config }) {
+    addUtilities({
+        '.cursor-auto': { cursor: 'auto' },
+        '.cursor-default': { cursor: 'default' },
+        '.cursor-pointer': { cursor: 'pointer' },
+        '.cursor-wait': { cursor: 'wait' },
+        '.cursor-move': { cursor: 'move' },
+        '.cursor-not-allowed': { cursor: 'not-allowed' },
+    }, config('modules.cursor'))
+  }
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 48edcb3d1..92756b395 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -10,7 +10,6 @@ import borderColors from './generators/borderColors'
 import borderRadius from './generators/borderRadius'
 import borderStyle from './generators/borderStyle'
 import borderWidths from './generators/borderWidths'
-import cursor from './generators/cursor'
 
 export default [
   { name: 'lists', generator: lists },
@@ -25,5 +24,4 @@ export default [
   { name: 'borderRadius', generator: borderRadius },
   { name: 'borderStyle', generator: borderStyle },
   { name: 'borderWidths', generator: borderWidths },
-  { name: 'cursor', generator: cursor },
 ]