diff --git a/massive/index.d.ts b/massive/index.d.ts
new file mode 100755
index 0000000000..53e857e689
--- /dev/null
+++ b/massive/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for massive-js 2.2
+// Project: https://github.com/robconery/massive-js
+// Definitions by: Pascal Birchler <https://github.com/swissspidy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace massive {
+	interface ConnectionOptions {
+		connectionString?: string;
+		db?: string;
+	}
+
+	interface Doc {
+		findDoc(context: any, callback: ResultCallback): void;
+		searchDoc(options: {
+			keys: string[];
+			term: string;
+		}, callback: ResultCallback): void;
+		saveDoc(context: string, callback: ResultCallback): void;
+		destroy(context: any, callback: ResultCallback): void;
+	}
+
+	interface QueryFile {
+		schema: string;
+		name: string;
+		db: Massive;
+		delimitedName: string;
+		delimitedSchema: string;
+		fullname: string;
+		delimitedFullName: string;
+		sql: string;
+		filePath: string;
+	}
+
+	interface QueryFunction {
+		find: (params: any|any[], callback: ResultCallback) => void;
+	}
+
+	interface QueryArguments {
+		sql: string;
+		options: any;
+		params: any;
+		next: ResultCallback;
+	}
+}
+
+export interface Massive {
+	custom: any;
+	comment: Table;
+	friendship: Table;
+	participation: Table;
+	person: Table;
+	practice: Table;
+	practicesession: Table;
+	sport: Table;
+	testdata: (callback: ResultCallback) => void;
+	team: Table;
+	teammember: Table;
+	teamsport: Table;
+	scriptsDir: string;
+	connectionString: string;
+	query: () => void;
+	stream: () => void;
+	executeSqlFile: (args: any, next: ResultCallback) => void;
+	end: () => void;
+	tables: Array<massive.Doc|Table>;
+	views: any[];
+	queryFiles: massive.QueryFile[];
+	schemas: any[];
+	functions: any[];
+	allowedSchemas: string;
+	blacklist: string;
+	exceptions: string;
+	excludeFunctions: boolean;
+	functionBlacklist: string;
+}
+
+export type ResultCallback = (err: Error, res: any) => void;
+export type ConnectCallback = (err: Error, db: Massive) => void;
+
+export interface QueryOptions {
+	limit?: number;
+	order?: string;
+	offset?: number;
+	columns?: string[];
+}
+
+export interface Table {
+	count(context: any, callback: ResultCallback): void;
+	find(context: any, callback: ResultCallback): void;
+	find(context: any, options: QueryOptions, callback: ResultCallback): void;
+	findOne(context: any, callback: ResultCallback): void;
+	findOne(context: any, options: QueryOptions, callback: ResultCallback): void;
+	insert(context: any, callback: ResultCallback): void;
+	save(context: any, callback: ResultCallback): void;
+	update(context: any, callback: ResultCallback): void;
+	update(context: any, data: any, callback: ResultCallback): void;
+	destroy(context: any, callback: ResultCallback): void;
+}
+
+export function connectSync(options: massive.ConnectionOptions): Massive;
+
+export function connect(options: massive.ConnectionOptions, callback: ConnectCallback): void;
+
+export function run(context: string, filter: number|number[], callback: ResultCallback): void;
+
+export function saveDoc(name: string, data: any, callback: ResultCallback): void;
diff --git a/massive/massive-tests.ts b/massive/massive-tests.ts
new file mode 100644
index 0000000000..2978440f4a
--- /dev/null
+++ b/massive/massive-tests.ts
@@ -0,0 +1,5 @@
+import * as Massive from 'massive';
+
+Massive.connect({connectionString: 'foo'}, (err: Error, db: Massive.Massive) => {});
+
+Massive.run('foo', 123, (err: Error, db: Massive.Massive) => {});
\ No newline at end of file
diff --git a/massive/tsconfig.json b/massive/tsconfig.json
new file mode 100755
index 0000000000..7c91e19b44
--- /dev/null
+++ b/massive/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "massive-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/massive/tslint.json b/massive/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/massive/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file