diff --git a/types/highlightjs/highlightjs-tests.ts b/types/highlightjs/highlightjs-tests.ts
new file mode 100644
index 0000000000..93059c85f8
--- /dev/null
+++ b/types/highlightjs/highlightjs-tests.ts
@@ -0,0 +1,9 @@
+import hljs = require('highlightjs');
+
+const code = "using System;\npublic class Test\n{\npublic static void Main()\n{\n// your code goes here\n}\n}";
+const lang = "cs";
+
+hljs.configure({ tabReplace: "    " }); // 4 spaces
+
+let hl = hljs.highlight(lang, code).value;
+hl = hljs.highlightAuto(code).value;
diff --git a/types/highlightjs/index.d.ts b/types/highlightjs/index.d.ts
new file mode 100644
index 0000000000..3d5022b5dd
--- /dev/null
+++ b/types/highlightjs/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for highlightjs 9.12
+// Project: https://github.com/isagalaev/highlight.js
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import highlightjs = require('highlight.js');
+export = highlightjs;
diff --git a/types/highlightjs/tsconfig.json b/types/highlightjs/tsconfig.json
new file mode 100644
index 0000000000..a139fae471
--- /dev/null
+++ b/types/highlightjs/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "highlightjs-tests.ts"
+    ]
+}
diff --git a/types/highlightjs/tslint.json b/types/highlightjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/highlightjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }