diff --git a/.gitignore b/.gitignore
index 7054c27..48bcc07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ npm-debug.log*
 .rollupcache
 dist/doc-temp
 dist/test
+doc/typedoc
\ No newline at end of file
diff --git a/package.json b/package.json
index 4590bde..a4006e5 100644
--- a/package.json
+++ b/package.json
@@ -38,9 +38,8 @@
     "build": "rollup -c --environment NODE_ENV:production",
     "postbuild": "npm run build:dts",
     "build:dts": "dts-bundle-generator ./src/aurelia-dependency-injection.ts -o dist/aurelia-dependency-injection.d.ts",
-    "predoc": "cross-env rimraf doc/api.json && rimraf dist/doc-temp && tsc --project tsconfig.build.json && node doc/shape-defs && copyfiles tsconfig.json dist/doc-temp",
-    "doc": "cross-env typedoc --json doc/api.json --excludeExternals --name aurelia-dependency-injection-docs dist",
-    "postdoc": "cross-env node doc/shape-doc && rimraf dist/doc-temp",
+    "doc": "typedoc --options typedoc.json",
+    "postdoc": "rimraf doc/typedoc",
     "precut-release": "npm run test && npm run lint && npm run build",
     "cut-release": "commit-and-tag-version -t \"\" -i doc/CHANGELOG.md --skip.commit --skip.tag",
     "postcut-release": " npm run doc"
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 8bdd40d..6b35d32 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -20,6 +20,9 @@
     "skipLibCheck": true,
     "strict": true
   },
+  "include": [
+    "dist"
+  ],
   "exclude": [
     ".vscode",
     "doc",
diff --git a/typedoc.json b/typedoc.json
new file mode 100644
index 0000000..696a8c8
--- /dev/null
+++ b/typedoc.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://typedoc.org/schema.json",
+  "entryPoints": ["./src/aurelia-dependency-injection.ts"],
+  "out": "doc/typedoc",
+  "json": "doc/api.json",
+  "emit": "docs",
+  "pretty": false
+}