diff --git a/lib/constants.js b/lib/constants.js
index 73b2621..4f84cee 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -98,6 +98,12 @@ export const LANGUAGES = [
     name: 'Auto',
     mode: 'auto'
   },
+  {
+    name: 'Apache',
+    mode: 'apache',
+    mime: 'text/apache',
+    custom: true
+  },
   {
     name: 'Bash',
     mode: 'shell',
diff --git a/lib/customModes/apache.js b/lib/customModes/apache.js
new file mode 100644
index 0000000..1d12e03
--- /dev/null
+++ b/lib/customModes/apache.js
@@ -0,0 +1,136 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Apache mode by gloony
+
+const CodeMirror = require('codemirror')
+
+CodeMirror.defineMode('apache', function(config) {
+  return {
+    token: function(stream, state) {
+      var sol = stream.sol() || state.afterSection
+      var eol = stream.eol()
+
+      state.afterSection = false
+
+      if (sol) {
+        if (state.nextMultiline) {
+          state.inMultiline = true
+          state.nextMultiline = false
+        } else {
+          state.position = 'def'
+        }
+      }
+
+      if (eol && !state.nextMultiline) {
+        state.inMultiline = false
+        state.position = 'def'
+      }
+
+      if (sol) {
+        while (stream.eatSpace()) {}
+      }
+
+      var ch = stream.next()
+
+      if (sol && ch === '#') {
+        state.position = 'comment'
+        stream.skipToEnd()
+        return 'comment'
+      } else if (ch === '!' && stream.peek() !== ' ') {
+        return 'number'
+      } else if (ch === ' ') {
+        if (stream.peek() === '[') {
+          if (stream.skipTo(']')) {
+            stream.next()
+          } else {
+            stream.skipToEnd()
+          }
+          return 'keyword'
+        } else if (stream.peek() === '(') {
+          if (stream.skipTo(')')) {
+            stream.next()
+          } else {
+            stream.skipToEnd()
+          }
+          return 'string'
+        } else {
+          state.position = 'unit'
+          return 'unit'
+        }
+      } else if (ch === '"') {
+        if (stream.skipTo('"')) {
+          stream.next()
+        } else {
+          stream.skipToEnd()
+        }
+        return 'quote'
+      } else if (sol && ch === '<') {
+        if (stream.skipTo('>')) {
+          stream.next()
+        } else {
+          stream.skipToEnd()
+        }
+        return 'meta'
+      } else if (ch === '%') {
+        if (stream.peek() === '{') {
+          if (stream.skipTo('}')) {
+            stream.next()
+          } else {
+            stream.skipToEnd()
+          }
+          return 'operator'
+        }
+      } else if (ch === '$') {
+        if (!isNaN(stream.peek()) && stream.peek() !== ' ') {
+          while (!isNaN(stream.peek()) && stream.peek() !== ' ') {
+            stream.next()
+          }
+          return 'operator'
+        }
+      } else if (ch === '\\') {
+        if (stream.peek() === '.') {
+          if (stream.skipTo(' ')) {
+            stream.next()
+          } else {
+            stream.skipToEnd()
+          }
+          return 'string'
+        }
+      } else if (ch === '.') {
+        if (stream.peek() === '*') {
+          if (stream.skipTo(' ')) {
+            stream.next()
+          } else {
+            stream.skipToEnd()
+          }
+          return 'string'
+        }
+      } else if (ch === '^') {
+        if (stream.skipTo(' ')) {
+          stream.next()
+        } else {
+          stream.skipToEnd()
+        }
+        return 'string'
+      }
+
+      return state.position
+    },
+
+    // electricInput: /<\/[\s\w:]+>$/,
+    lineComment: '#',
+    fold: 'brace',
+
+    startState: function() {
+      return {
+        position: 'def',
+        nextMultiline: false,
+        inMultiline: false,
+        afterSection: false
+      }
+    }
+  }
+})
+
+CodeMirror.defineMIME('text/apache', 'apache')
+CodeMirror.defineMIME('text/htaccess', 'apache')