diff --git a/loader.js b/loader.js
index 4ceac4d3..4650f6dc 100644
--- a/loader.js
+++ b/loader.js
@@ -1,7 +1,7 @@
 "use strict";
 
-const os = require('os');
-const gql = require('./src');
+import os from 'os';
+import gql from './src';
 
 // Takes `source` (the source GraphQL query string)
 // and `doc` (the parsed GraphQL document) and tacks on
diff --git a/package.json b/package.json
index c8a3214f..18da3dae 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "version": "2.11.0",
   "description": "A JavaScript template literal tag that parses GraphQL queries",
   "main": "./lib/graphql-tag.umd.js",
-  "module": "./src/index.js",
-  "jsnext:main": "./src/index.js",
+  "module": "./lib/graphql-tag.js",
+  "jsnext:main": "./lib/graphql-tag.js",
   "sideEffects": false,
   "scripts": {
     "bundle": "rollup -c && cp src/index.js.flow lib/graphql-tag.umd.js.flow",
diff --git a/rollup.config.js b/rollup.config.js
index 0e7f3de5..413cd0de 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,11 +1,22 @@
 export default {
   input: 'src/index.js',
-  output: {
-    file: 'lib/graphql-tag.umd.js',
-    format: 'umd',
-    name: 'graphql-tag',
-    sourcemap: true
-  },
+  output: [
+    {
+      file: 'lib/graphql-tag.js',
+      format: 'esm',
+      sourcemap: true
+    },
+    {
+      file: 'lib/graphql-tag.umd.js',
+      format: 'umd',
+      globals: {
+        'graphql/language': 'language'
+      },
+      name: 'graphql-tag',
+      sourcemap: true,
+      exports: 'named'
+    }
+  ],
   onwarn
 };
 
diff --git a/src/index.js b/src/index.js
index f52711e4..f0b2a067 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,4 @@
-var parser = require('graphql/language/parser');
-
-var parse = parser.parse;
+import { parse } from 'graphql/language';
 
 // Strip insignificant whitespace
 // Note that this could do a lot more, such as reorder fields etc.
@@ -177,4 +175,4 @@ gql.disableFragmentWarnings = disableFragmentWarnings;
 gql.enableExperimentalFragmentVariables = enableExperimentalFragmentVariables;
 gql.disableExperimentalFragmentVariables = disableExperimentalFragmentVariables;
 
-module.exports = gql;
+export default gql;
diff --git a/test/graphql.js b/test/graphql.js
index e77af238..16e6a0ea 100644
--- a/test/graphql.js
+++ b/test/graphql.js
@@ -1,6 +1,7 @@
-const gql = require('../src');
-const loader = require('../loader');
-const assert = require('chai').assert;
+import { assert } from 'chai';
+
+import gql from '../src';
+import loader from '../loader';
 
 describe('gql', () => {
   it('parses queries', () => {