diff --git a/doctoc.js b/doctoc.js
index 578dfa93..cb229047 100755
--- a/doctoc.js
+++ b/doctoc.js
@@ -16,7 +16,7 @@ function cleanPath(path) {
   return homeExpanded.replace(/\s/g, '\\ ');
 }
 
-function transformAndSave(files, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, stdOut, updateOnly) {
+function transformAndSave(files, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, stdOut, updateOnly, syntax) {
   if (processAll) {
     console.log('--all flag is enabled. Including headers before the TOC location.')
   }
@@ -24,13 +24,13 @@ function transformAndSave(files, mode, maxHeaderLevel, title, notitle, entryPref
   if (updateOnly) {
     console.log('--update-only flag is enabled. Only updating files that already have a TOC.')
   }
-  
+
   console.log('\n==================\n');
 
   var transformed = files
     .map(function (x) {
       var content = fs.readFileSync(x.path, 'utf8')
-        , result = transform(content, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, updateOnly);
+        , result = transform(content, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, updateOnly, syntax);
       result.path = x.path;
       return result;
     });
@@ -48,7 +48,7 @@ function transformAndSave(files, mode, maxHeaderLevel, title, notitle, entryPref
     console.log('"%s" is up to date', x.path);
   });
 
-  changed.forEach(function (x) { 
+  changed.forEach(function (x) {
     if (stdOut) {
       console.log('==================\n\n"%s" should be updated', x.path)
     } else {
@@ -62,7 +62,7 @@ function printUsageAndExit(isErr) {
 
   var outputFunc = isErr ? console.error : console.info;
 
-  outputFunc('Usage: doctoc [mode] [--entryprefix prefix] [--notitle | --title title] [--maxlevel level] [--all] [--update-only] <path> (where path is some path to a directory (e.g., .) or a file (e.g., README.md))');
+  outputFunc('Usage: doctoc [mode] [--entryprefix prefix] [--notitle | --title title] [--maxlevel level] [--all] [--update-only] [--syntax (' + supportedSyntaxes.join("|") + ')] <path> (where path is some path to a directory (e.g., .) or a file (e.g., README.md))');
   outputFunc('\nAvailable modes are:');
   for (var key in modes) {
     outputFunc('  --%s\t%s', key, modes[key]);
@@ -72,6 +72,7 @@ function printUsageAndExit(isErr) {
   process.exit(isErr ? 2 : 0);
 }
 
+var supportedSyntaxes = ['md', 'mdx']
 var modes = {
     bitbucket : 'bitbucket.org'
   , nodejs    : 'nodejs.org'
@@ -84,7 +85,7 @@ var mode = modes['github'];
 
 var argv = minimist(process.argv.slice(2)
     , { boolean: [ 'h', 'help', 'T', 'notitle', 's', 'stdout', 'all' , 'u', 'update-only'].concat(Object.keys(modes))
-    , string: [ 'title', 't', 'maxlevel', 'm', 'entryprefix' ]
+    , string: [ 'title', 't', 'maxlevel', 'm', 'entryprefix', 'syntax' ]
     , unknown: function(a) { return (a[0] == '-' ? (console.error('Unknown option(s): ' + a), printUsageAndExit(true)) : true); }
     });
 
@@ -92,6 +93,11 @@ if (argv.h || argv.help) {
   printUsageAndExit();
 }
 
+if (argv['syntax'] !== undefined && !supportedSyntaxes.includes(argv['syntax'])) {
+  console.error('Unknown syntax:', argv['syntax'])
+  console.error('Supported options:', supportedSyntaxes.join(", "))
+  process.exit(2)
+}
 for (var key in modes) {
   if (argv[key]) {
     mode = modes[key];
@@ -104,7 +110,7 @@ var entryPrefix = argv.entryprefix || '-';
 var processAll = argv.all;
 var stdOut = argv.s || argv.stdout
 var updateOnly = argv.u || argv['update-only']
-
+var syntax = argv['syntax'] || 'md'
 var maxHeaderLevel = argv.m || argv.maxlevel;
 if (maxHeaderLevel && isNaN(maxHeaderLevel) || maxHeaderLevel < 0) { console.error('Max. heading level specified is not a positive number: ' + maxHeaderLevel), printUsageAndExit(true); }
 
@@ -114,13 +120,13 @@ for (var i = 0; i < argv._.length; i++) {
 
   if (stat.isDirectory()) {
     console.log ('\nDocToccing "%s" and its sub directories for %s.', target, mode);
-    files = file.findMarkdownFiles(target);
+    files = file.findMarkdownFiles(target, syntax);
   } else {
     console.log ('\nDocToccing single file "%s" for %s.', target, mode);
     files = [{ path: target }];
   }
 
-  transformAndSave(files, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, stdOut, updateOnly);
+  transformAndSave(files, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, stdOut, updateOnly, syntax);
 
   console.log('\nEverything is OK.');
 }
diff --git a/lib/file.js b/lib/file.js
index 1479be99..0457cda5 100644
--- a/lib/file.js
+++ b/lib/file.js
@@ -2,41 +2,43 @@ var path  =  require('path')
  ,  fs  =  require('fs')
  ,  _   =  require('underscore');
 
-var markdownExts = ['.md', '.markdown'];
 var ignoredDirs  = ['.', '..', '.git', 'node_modules'];
-
-function separateFilesAndDirs(fileInfos) {
+var extensions = {
+  mdx: ['.mdx'],
+  md: ['.md', '.markdown'],
+}
+function separateFilesAndDirs(fileInfos, syntax) {
   return {
     directories :  _(fileInfos).filter(function (x) {
       return x.isDirectory() && !_(ignoredDirs).include(x.name);
     }),
-    markdownFiles :  _(fileInfos).filter(function (x) { 
-      return x.isFile() && _(markdownExts).include(path.extname(x.name)); 
+    markdownFiles :  _(fileInfos).filter(function (x) {
+      return x.isFile() && _(extensions[syntax]).include(path.extname(x.name));
     })
   };
 }
 
-function findRec(currentPath) {
+function findRec(currentPath, syntax) {
   function getStat (entry) {
     var target = path.join(currentPath, entry),
       stat = fs.statSync(target);
 
-    return  _(stat).extend({ 
+    return  _(stat).extend({
       name: entry,
       path: target
     });
   }
-  
+
   function process (fileInfos) {
-    var res = separateFilesAndDirs(fileInfos);
+    var res = separateFilesAndDirs(fileInfos, syntax);
     var tgts = _(res.directories).pluck('path');
 
-    if (res.markdownFiles.length > 0) 
+    if (res.markdownFiles.length > 0)
       console.log('\nFound %s in "%s"', _(res.markdownFiles).pluck('name').join(', '), currentPath);
-    else 
+    else
       console.log('\nFound nothing in "%s"', currentPath);
 
-    return { 
+    return {
       markdownFiles :  res.markdownFiles,
       subdirs     :  tgts
     };
@@ -44,16 +46,16 @@ function findRec(currentPath) {
 
   var stats                  =  _(fs.readdirSync(currentPath)).map(getStat)
     , res                    =  process(stats)
-    , markdownsInSubdirs     =  _(res.subdirs).map(findRec)
+    , markdownsInSubdirs     =  _(res.subdirs).map((subdir)=> findRec(subdir, syntax))
     , allMarkdownsHereAndSub =  res.markdownFiles.concat(markdownsInSubdirs);
 
   return _(allMarkdownsHereAndSub).flatten();
 }
 
 // Finds all markdown files in given directory and its sub-directories
-// @param {String  } dir - the absolute directory to search in 
-exports.findMarkdownFiles = function(dir) {
-  return findRec(dir);
+// @param {String  } dir - the absolute directory to search in
+exports.findMarkdownFiles = function(dir, syntax) {
+  return findRec(dir, syntax);
 };
 
 /* Example:
diff --git a/lib/transform.js b/lib/transform.js
index afd713cf..9dabeb51 100644
--- a/lib/transform.js
+++ b/lib/transform.js
@@ -6,18 +6,33 @@ var _             = require('underscore')
   , getHtmlHeaders = require('./get-html-headers')
   , md            = require('@textlint/markdown-to-ast');
 
-var start = '<!-- START doctoc generated TOC please keep comment here to allow auto update -->\n' +
-            '<!-- DON\'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->'
-  , end   = '<!-- END doctoc generated TOC please keep comment here to allow auto update -->'
-  , skipTag = '<!-- DOCTOC SKIP -->';
+var commentTypes = {
+  md: {
+    start: "<!--",
+    end: "-->",
+    escapedStart: "<!--",
+  },
+  mdx: {
+    start: "{/*",
+    end: "*/}",
+    escapedStart: "{\/\\*",
+  }
+}
 
+var { start: startMd , end: endMd } = generateComments('md')
 
-function matchesStart(line) {
-  return (/<!-- START doctoc /).test(line);
+function matchesStart(syntax) {
+  var commentEscapedStart = commentTypes[syntax].escapedStart
+  return function(line){
+    return new RegExp(`${commentEscapedStart} START doctoc `).test(line);
+  }
 }
 
-function matchesEnd(line) {
-  return (/<!-- END doctoc /).test(line);
+function matchesEnd(syntax) {
+  var commentEscapedStart = commentTypes[syntax].escapedStart
+  return function(line){
+    return new RegExp(`${commentEscapedStart} END doctoc `).test(line);
+  }
 }
 
 function notNull(x) { return  x !== null; }
@@ -31,6 +46,19 @@ function isString(y) {
   return typeof y === 'string';
 }
 
+function generateComments(syntax){
+  var commentStart = commentTypes[syntax].start
+  , commentEnd = commentTypes[syntax].end;
+
+  var start = `${commentStart} START doctoc generated TOC please keep comment here to allow auto update ${commentEnd}\n` +
+            `${commentStart} DON\'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE ${commentEnd}`
+  , end   = `${commentStart} END doctoc generated TOC please keep comment here to allow auto update ${commentEnd}`
+  , skipTag = `${commentStart} DOCTOC SKIP ${commentEnd}`;
+
+  exports.start = start;
+  exports.end = end;
+  return { start, end, skipTag}
+}
 
 function getMarkdownHeaders (lines, maxHeaderLevel) {
   function extractText (header) {
@@ -108,7 +136,11 @@ function determineTitle(title, notitle, lines, info) {
   return info.hasStart ? lines[info.startIdx + 2] : defaultTitle;
 }
 
-exports = module.exports = function transform(content, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, updateOnly) {
+exports = module.exports = function transform(content, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, updateOnly, syntax) {
+  syntax = syntax || "md"
+  var { skipTag, start, end } = generateComments(syntax)
+  var matchesStartBySyntax = matchesStart(syntax)
+  var matchesEndBySyntax = matchesEnd(syntax)
   if (content.indexOf(skipTag) !== -1) return { transformed: false };
 
   mode = mode || 'github.com';
@@ -118,7 +150,7 @@ exports = module.exports = function transform(content, mode, maxHeaderLevel, tit
   var maxHeaderLevelHtml = maxHeaderLevel || 4;
 
   var lines = content.split('\n')
-    , info = updateSection.parse(lines, matchesStart, matchesEnd)
+    , info = updateSection.parse(lines, matchesStartBySyntax, matchesEndBySyntax)
 
   if (!info.hasStart && updateOnly) {
     return { transformed: false };
@@ -164,9 +196,9 @@ exports = module.exports = function transform(content, mode, maxHeaderLevel, tit
 
   if (currentToc === toc) return { transformed: false };
 
-  var data = updateSection(lines.join('\n'), wrappedToc, matchesStart, matchesEnd, true);
+  var data = updateSection(lines.join('\n'), wrappedToc, matchesStartBySyntax, matchesEndBySyntax, true);
   return { transformed : true, data : data, toc: toc, wrappedToc: wrappedToc };
 };
 
-exports.start = start;
-exports.end = end;
+exports.start = startMd;
+exports.end = endMd;
diff --git a/test/file.js b/test/file.js
new file mode 100644
index 00000000..be9af38d
--- /dev/null
+++ b/test/file.js
@@ -0,0 +1,33 @@
+'use strict';
+/*jshint asi: true */
+
+var test = require('tap').test
+  , findMarkdownFiles = require('../lib/file').findMarkdownFiles
+  ,  _   =  require('underscore');
+const fixturesDir = __dirname + "/fixtures"
+test('\nmatch mdx files only with syntax=mdx', function (t) {
+  t.deepEqual(
+    _(findMarkdownFiles(fixturesDir, 'mdx')).every((file) => file.path.endsWith(".mdx"))
+    , true
+    , 'match mdx files only with syntax=mdx'
+  )
+  t.end()
+});
+
+test('\nmatch md files only with syntax=md', function (t) {
+  t.deepEqual(
+    _(findMarkdownFiles(fixturesDir, 'md')).every((file) => file.path.endsWith(".md"))
+    , true
+    , 'match md files only with syntax=md'
+  )
+  t.end()
+});
+
+test('\nmatch md files only with undefined syntax', function (t) {
+  t.deepEqual(
+    _(findMarkdownFiles(fixturesDir, 'md')).every((file) => file.path.endsWith(".md"))
+    , true
+    , 'match md files only with undefined syntax'
+  )
+  t.end()
+});
\ No newline at end of file
diff --git a/test/fixtures/readme-syntax.md b/test/fixtures/readme-syntax.md
new file mode 100644
index 00000000..bf606ee8
--- /dev/null
+++ b/test/fixtures/readme-syntax.md
@@ -0,0 +1,9 @@
+# Hello, world!
+
+should only be matched if syntax=md
+
+## Installation
+
+## API
+
+## License
diff --git a/test/fixtures/readme-syntax.mdx b/test/fixtures/readme-syntax.mdx
new file mode 100644
index 00000000..733f31b0
--- /dev/null
+++ b/test/fixtures/readme-syntax.mdx
@@ -0,0 +1,9 @@
+# Hello, world!
+
+should only be matched if syntax=mdx
+
+## Installation
+
+## API
+
+## License
diff --git a/test/transform.js b/test/transform.js
index 6481c3cd..30e2ccb6 100644
--- a/test/transform.js
+++ b/test/transform.js
@@ -8,9 +8,9 @@ function inspect(obj, depth) {
   console.log(require('util').inspect(obj, false, depth || 5, true));
 }
 
-function check(md, anchors, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll) {
+function check(md, anchors, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, updateOnly, syntax) {
   test('transforming', function (t) {
-    var res = transform(md, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll)
+    var res = transform(md, mode, maxHeaderLevel, title, notitle, entryPrefix, processAll, updateOnly, syntax)
 
     // remove wrapper
     var data = res.data.split('\n');
@@ -32,6 +32,11 @@ function check(md, anchors, mode, maxHeaderLevel, title, notitle, entryPrefix, p
     t.end()
   })
 }
+
+function getCommentLines(transformRes){
+    var lines = transformRes.wrappedToc.split('\n')
+    return lines.slice(0,2).concat(lines[lines.length - 1])
+}
 //function check() {}
 
 check(
@@ -221,7 +226,7 @@ check(
 
 
 test('transforming when old toc exists', function (t) {
-  var md = [ 
+  var md = [
       '# Header above'
     , ''
     , 'The above header should be ignored since it is above the existing toc'
@@ -232,7 +237,7 @@ test('transforming when old toc exists', function (t) {
     , ''
     , '- [OldHeader](#oldheader)'
     , ''
-    , '<!-- END doctoc generated TOC please keep comment here to allow auto update -->' 
+    , '<!-- END doctoc generated TOC please keep comment here to allow auto update -->'
     , '## Header'
     , 'some content'
     , ''
@@ -240,7 +245,7 @@ test('transforming when old toc exists', function (t) {
 
   var res = transform(md)
 
-  t.ok(res.transformed, 'transforms it')     
+  t.ok(res.transformed, 'transforms it')
 
   t.deepEqual(
       res.toc.split('\n')
@@ -248,9 +253,9 @@ test('transforming when old toc exists', function (t) {
       '',
       '- [Header](#header)',
       '' ]
-    , 'replaces old toc' 
+    , 'replaces old toc'
   )
-  
+
   t.deepEqual(
       res.wrappedToc.split('\n')
     , [ '<!-- START doctoc generated TOC please keep comment here to allow auto update -->',
@@ -259,7 +264,7 @@ test('transforming when old toc exists', function (t) {
         '',
         '- [Header](#header)',
         '',
-        '<!-- END doctoc generated TOC please keep comment here to allow auto update -->' 
+        '<!-- END doctoc generated TOC please keep comment here to allow auto update -->'
       ]
     , 'wraps old toc'
   )
@@ -281,12 +286,12 @@ test('transforming when old toc exists', function (t) {
         'some content',
         '' ]
     , 'updates the content with the new toc and ignores header before existing toc'
-  ) 
+  )
   t.end()
 })
 
 test('transforming when old toc exists and --all flag is set', function (t) {
-  var md = [ 
+  var md = [
       '# Header above'
     , ''
     , 'The above header should be ignored since it is above the existing toc'
@@ -297,7 +302,7 @@ test('transforming when old toc exists and --all flag is set', function (t) {
     , ''
     , '- [OldHeader](#oldheader)'
     , ''
-    , '<!-- END doctoc generated TOC please keep comment here to allow auto update -->' 
+    , '<!-- END doctoc generated TOC please keep comment here to allow auto update -->'
     , '## Header'
     , 'some content'
     , ''
@@ -305,7 +310,7 @@ test('transforming when old toc exists and --all flag is set', function (t) {
 
   var res = transform(md, undefined, undefined, undefined, undefined, undefined, true)
 
-  t.ok(res.transformed, 'transforms it')     
+  t.ok(res.transformed, 'transforms it')
 
   t.deepEqual(
       res.toc.split('\n')
@@ -314,9 +319,9 @@ test('transforming when old toc exists and --all flag is set', function (t) {
       '- [Header above](#header-above)',
       '  - [Header](#header)',
       '' ]
-    , 'replaces old toc' 
+    , 'replaces old toc'
   )
-  
+
   t.deepEqual(
       res.wrappedToc.split('\n')
     , [ '<!-- START doctoc generated TOC please keep comment here to allow auto update -->',
@@ -326,7 +331,7 @@ test('transforming when old toc exists and --all flag is set', function (t) {
         '- [Header above](#header-above)',
         '  - [Header](#header)',
         '',
-        '<!-- END doctoc generated TOC please keep comment here to allow auto update -->' 
+        '<!-- END doctoc generated TOC please keep comment here to allow auto update -->'
       ]
     , 'wraps old toc'
   )
@@ -349,7 +354,7 @@ test('transforming when old toc exists and --all flag is set', function (t) {
         'some content',
         '' ]
     , 'updates the content with the new toc and ignores header before existing toc'
-  ) 
+  )
   t.end()
 })
 
@@ -470,3 +475,110 @@ check(
   , undefined
   , '1.' // pass '1.' as the prefix for toc entries
   )
+
+
+check(
+    [ '# My Module'
+    , 'Some text here'
+    , '## API'
+    , '### Method One'
+    , 'works like this'
+    , '### Method Two'
+    , '#### Main Usage'
+    , 'some main usage here'
+    ].join('\n')
+  , [ '**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*\n\n'
+    , '- [My Module](#my-module)\n'
+    ,   '  - [API](#api)\n'
+    ,     '    - [Method One](#method-one)\n'
+    ,     '    - [Method Two](#method-two)\n'
+    ,         '      - [Main Usage](#main-usage)\n\n\n'
+    ].join('')
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , 'md'
+)
+
+check(
+    [ '# My Module'
+    , 'Some text here'
+    , '## API'
+    , '### Method One'
+    , 'works like this'
+    , '### Method Two'
+    , '#### Main Usage'
+    , 'some main usage here'
+    ].join('\n')
+  , [ '**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*\n\n'
+    , '- [My Module](#my-module)\n'
+    ,   '  - [API](#api)\n'
+    ,     '    - [Method One](#method-one)\n'
+    ,     '    - [Method Two](#method-two)\n'
+    ,         '      - [Main Usage](#main-usage)\n\n\n'
+    ].join('')
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , undefined
+    , 'mdx'
+)
+
+test('should use <!-- --> comments if syntax=md', function (t) {
+    var res = transform(
+                  [ '# My Module'
+                  , 'Some text here'
+                  , '## API'
+                  , '### Method One'
+                  , 'works like this'
+                  , '### Method Two'
+                  , '#### Main Usage'
+                  , 'some main usage here'
+                  ].join('\n')
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , 'md'
+              )
+
+    var commentLines = getCommentLines(res);
+    t.deepEqual(commentLines.every((line) => line.startsWith('<!--') && line.endsWith('-->')), true)
+    t.end()
+})
+
+test('should use {/* */} comments if syntax=mdx', function (t) {
+    var res = transform(
+                  [ '# My Module'
+                  , 'Some text here'
+                  , '## API'
+                  , '### Method One'
+                  , 'works like this'
+                  , '### Method Two'
+                  , '#### Main Usage'
+                  , 'some main usage here'
+                  ].join('\n')
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , undefined
+                  , 'mdx'
+              )
+
+    var commentLines = getCommentLines(res);
+    t.deepEqual(commentLines.every((line) => line.startsWith('{/*') && line.endsWith('*/}')), true)
+    t.end()
+})
\ No newline at end of file