diff --git a/.gitignore b/.gitignore
index 4958559e..8aea04b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ node_modules/
 *.swp
 .lock-wscript
 lib/
-lib-headless/
 out/
 out-test/
 .nyc_output/
diff --git a/bin/package_headless.js b/bin/package_headless.js
index 27613200..104844e2 100644
--- a/bin/package_headless.js
+++ b/bin/package_headless.js
@@ -16,7 +16,7 @@ const xtermHeadlessPackageJson = {
   ...xtermPackageJson,
   name: 'xterm-headless',
   description: 'A headless terminal component that runs in Node.js',
-  main: 'lib/xterm-headless.js',
+  main: 'lib-headless/xterm-headless.js',
   types: 'typings/xterm-headless.d.ts',
 };
 delete xtermHeadlessPackageJson['scripts'];
diff --git a/headless/.gitignore b/headless/.gitignore
index 9b8b2749..4aba0be5 100644
--- a/headless/.gitignore
+++ b/headless/.gitignore
@@ -1,2 +1,3 @@
+lib-headless/
 typings/
 package.json
diff --git a/package.json b/package.json
index beffc66b..2d128b08 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "prepackage": "npm run build",
     "package": "webpack",
     "package-headless": "webpack --config ./webpack.config.headless.js",
+    "postpackage-headless": "node ./bin/package_headless.js",
     "compile": "tsc -b ./src/common/public/tsconfig.json",
     "start": "node demo/start",
     "start-debug": "node --inspect-brk demo/start",
diff --git a/webpack.config.headless.js b/webpack.config.headless.js
index 805b9a3e..2fe75915 100644
--- a/webpack.config.headless.js
+++ b/webpack.config.headless.js
@@ -34,7 +34,7 @@ module.exports = {
   },
   output: {
     filename: 'xterm.js',
-    path: path.resolve('./lib-headless'),
+    path: path.resolve('./headless/lib-headless'),
     library: {
       type: 'commonjs'
     }