diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 63d71b0339e..32a51de899e 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -750,14 +750,18 @@ namespace ts {
         }
 
         function writeTypeAliasDeclaration(node: TypeAliasDeclaration) {
+            let prevEnclosingDeclaration = enclosingDeclaration;
+            enclosingDeclaration = node;
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
             write("type ");
             writeTextOfNode(currentSourceFile, node.name);
+            emitTypeParameters(node.typeParameters);
             write(" = ");
             emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
             write(";");
             writeLine();
+            enclosingDeclaration = prevEnclosingDeclaration;
 
             function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
                 return {
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.js b/tests/baselines/reference/typeAliasDeclarationEmit.js
new file mode 100644
index 00000000000..6e82fe4b07d
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -0,0 +1,14 @@
+//// [typeAliasDeclarationEmit.ts]
+
+export type callback<T> = () => T;
+
+export type CallbackArray<T extends callback> = () => T;
+
+//// [typeAliasDeclarationEmit.js]
+define(["require", "exports"], function (require, exports) {
+});
+
+
+//// [typeAliasDeclarationEmit.d.ts]
+export declare type callback<T> = () => T;
+export declare type CallbackArray<T extends callback> = () => T;
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.symbols b/tests/baselines/reference/typeAliasDeclarationEmit.symbols
new file mode 100644
index 00000000000..5f98ea75a5a
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/typeAliasDeclarationEmit.ts ===
+
+export type callback<T> = () => T;
+>callback : Symbol(callback, Decl(typeAliasDeclarationEmit.ts, 0, 0))
+>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 1, 21))
+>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 1, 21))
+
+export type CallbackArray<T extends callback> = () => T;
+>CallbackArray : Symbol(CallbackArray, Decl(typeAliasDeclarationEmit.ts, 1, 34))
+>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 3, 26))
+>callback : Symbol(callback, Decl(typeAliasDeclarationEmit.ts, 0, 0))
+>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 3, 26))
+
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit.types b/tests/baselines/reference/typeAliasDeclarationEmit.types
new file mode 100644
index 00000000000..6f9359e36f5
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/typeAliasDeclarationEmit.ts ===
+
+export type callback<T> = () => T;
+>callback : () => T
+>T : T
+>T : T
+
+export type CallbackArray<T extends callback> = () => T;
+>CallbackArray : () => T
+>T : T
+>callback : () => T
+>T : T
+
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.js b/tests/baselines/reference/typeAliasDeclarationEmit2.js
new file mode 100644
index 00000000000..4bb1bd3efd9
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.js
@@ -0,0 +1,13 @@
+//// [typeAliasDeclarationEmit2.ts]
+
+export type A<a> = { value: a };
+
+//// [typeAliasDeclarationEmit2.js]
+define(["require", "exports"], function (require, exports) {
+});
+
+
+//// [typeAliasDeclarationEmit2.d.ts]
+export declare type A<a> = {
+    value: a;
+};
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.symbols b/tests/baselines/reference/typeAliasDeclarationEmit2.symbols
new file mode 100644
index 00000000000..aebd457d24e
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/typeAliasDeclarationEmit2.ts ===
+
+export type A<a> = { value: a };
+>A : Symbol(A, Decl(typeAliasDeclarationEmit2.ts, 0, 0))
+>a : Symbol(a, Decl(typeAliasDeclarationEmit2.ts, 1, 14))
+>value : Symbol(value, Decl(typeAliasDeclarationEmit2.ts, 1, 20))
+>a : Symbol(a, Decl(typeAliasDeclarationEmit2.ts, 1, 14))
+
diff --git a/tests/baselines/reference/typeAliasDeclarationEmit2.types b/tests/baselines/reference/typeAliasDeclarationEmit2.types
new file mode 100644
index 00000000000..bc8bd30935e
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/typeAliasDeclarationEmit2.ts ===
+
+export type A<a> = { value: a };
+>A : { value: a; }
+>a : a
+>value : a
+>a : a
+
diff --git a/tests/cases/compiler/typeAliasDeclarationEmit.ts b/tests/cases/compiler/typeAliasDeclarationEmit.ts
new file mode 100644
index 00000000000..be7e40453f6
--- /dev/null
+++ b/tests/cases/compiler/typeAliasDeclarationEmit.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+// @module: AMD
+// @declaration: true
+
+export type callback<T> = () => T;
+
+export type CallbackArray<T extends callback> = () => T;
\ No newline at end of file
diff --git a/tests/cases/compiler/typeAliasDeclarationEmit2.ts b/tests/cases/compiler/typeAliasDeclarationEmit2.ts
new file mode 100644
index 00000000000..33aecd7d5c9
--- /dev/null
+++ b/tests/cases/compiler/typeAliasDeclarationEmit2.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @module: AMD
+// @declaration: true
+
+export type A<a> = { value: a };
\ No newline at end of file