diff --git a/cli/targets/static.js b/cli/targets/static.js
index c44b0195f..d88399640 100644
--- a/cli/targets/static.js
+++ b/cli/targets/static.js
@@ -87,7 +87,6 @@ function buildNamespace(ref, ns) {
         return;
     if (ns.name !== "") {
         push("");
-        push("/** @alias " + ns.fullName.substring(1) + " */");
         push(name(ref) + "." + name(ns.name) + " = (function() {");
         ++indent;
     }
diff --git a/dist/protobuf.js b/dist/protobuf.js
index 3ae4aa198..c38ae9a12 100644
--- a/dist/protobuf.js
+++ b/dist/protobuf.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
- * Compiled Mon, 19 Dec 2016 22:48:33 UTC
+ * Compiled Mon, 19 Dec 2016 23:08:12 UTC
  * Licensed under the Apache License, Version 2.0
  * see: https://github.com/dcodeIO/protobuf.js for details
  */
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
index 11f6efce4..40c2e0ab8 100644
--- a/dist/protobuf.min.js
+++ b/dist/protobuf.min.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
- * Compiled Mon, 19 Dec 2016 22:48:33 UTC
+ * Compiled Mon, 19 Dec 2016 23:08:12 UTC
  * Licensed under the Apache License, Version 2.0
  * see: https://github.com/dcodeIO/protobuf.js for details
  */
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
index 82901471a..2db4c92cf 100644
Binary files a/dist/protobuf.min.js.gz and b/dist/protobuf.min.js.gz differ
diff --git a/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
index f34f8f558..0c2fb1e90 100644
--- a/dist/runtime/protobuf.js
+++ b/dist/runtime/protobuf.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
- * Compiled Mon, 19 Dec 2016 22:48:33 UTC
+ * Compiled Mon, 19 Dec 2016 23:08:12 UTC
  * Licensed under the Apache License, Version 2.0
  * see: https://github.com/dcodeIO/protobuf.js for details
  */
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
index 6cb97c65a..920f287dc 100644
--- a/dist/runtime/protobuf.min.js
+++ b/dist/runtime/protobuf.min.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
- * Compiled Mon, 19 Dec 2016 22:48:33 UTC
+ * Compiled Mon, 19 Dec 2016 23:08:12 UTC
  * Licensed under the Apache License, Version 2.0
  * see: https://github.com/dcodeIO/protobuf.js for details
  */
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
index 9eb3c87a9..422a59ac4 100644
Binary files a/dist/runtime/protobuf.min.js.gz and b/dist/runtime/protobuf.min.js.gz differ
diff --git a/tests/data/ambiguous-names.js b/tests/data/ambiguous-names.js
index e95064cdd..2894e7fc6 100644
--- a/tests/data/ambiguous-names.js
+++ b/tests/data/ambiguous-names.js
@@ -8,7 +8,6 @@ var $lazyTypes = [];
 // Exported root namespace
 var $root = {};
 
-/** @alias A */
 $root.A = (function() {
 
     /**
@@ -139,7 +138,6 @@ $root.A = (function() {
     return A;
 })();
 
-/** @alias B */
 $root.B = (function() {
 
     /**
diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js
index ca873916b..16094db66 100644
--- a/tests/data/mapbox/vector_tile.js
+++ b/tests/data/mapbox/vector_tile.js
@@ -8,7 +8,6 @@ var $lazyTypes = [];
 // Exported root namespace
 var $root = {};
 
-/** @alias vector_tile */
 $root.vector_tile = (function() {
 
     /**
@@ -18,7 +17,6 @@ $root.vector_tile = (function() {
      */
     var vector_tile = {};
 
-    /** @alias vector_tile.Tile */
     vector_tile.Tile = (function() {
 
         /**
@@ -166,7 +164,6 @@ $root.vector_tile = (function() {
             POLYGON: 3
         };
 
-        /** @alias vector_tile.Tile.Value */
         Tile.Value = (function() {
 
             /**
@@ -393,7 +390,6 @@ $root.vector_tile = (function() {
             return Value;
         })();
 
-        /** @alias vector_tile.Tile.Feature */
         Tile.Feature = (function() {
 
             /**
@@ -607,7 +603,6 @@ $root.vector_tile = (function() {
             return Feature;
         })();
 
-        /** @alias vector_tile.Tile.Layer */
         Tile.Layer = (function() {
 
             /**
diff --git a/tests/data/package.js b/tests/data/package.js
index a503c08e7..c056dd3a1 100644
--- a/tests/data/package.js
+++ b/tests/data/package.js
@@ -8,7 +8,6 @@ var $lazyTypes = [];
 // Exported root namespace
 var $root = {};
 
-/** @alias Package */
 $root.Package = (function() {
 
     /**
@@ -468,7 +467,6 @@ $root.Package = (function() {
         /* eslint-enable */
     })();
 
-    /** @alias Package.Repository */
     Package.Repository = (function() {
 
         /**
diff --git a/tests/data/rpc.js b/tests/data/rpc.js
index 584875e9a..5537187f8 100644
--- a/tests/data/rpc.js
+++ b/tests/data/rpc.js
@@ -8,7 +8,6 @@ var $lazyTypes = [];
 // Exported root namespace
 var $root = {};
 
-/** @alias MyService */
 $root.MyService = (function() {
 
     /**
@@ -74,7 +73,6 @@ $root.MyService = (function() {
     return MyService;
 })();
 
-/** @alias MyRequest */
 $root.MyRequest = (function() {
 
     /**
@@ -205,7 +203,6 @@ $root.MyRequest = (function() {
     return MyRequest;
 })();
 
-/** @alias MyResponse */
 $root.MyResponse = (function() {
 
     /**
diff --git a/types/protobuf.js.d.ts b/types/protobuf.js.d.ts
index 57ca27fde..a944ea5ab 100644
--- a/types/protobuf.js.d.ts
+++ b/types/protobuf.js.d.ts
@@ -1,5 +1,5 @@
 // $> pbts --name protobufjs --out types/protobuf.js.d.ts src
-// Generated Mon, 19 Dec 2016 22:48:40 UTC
+// Generated Mon, 19 Dec 2016 23:08:18 UTC
 declare module "protobufjs" {
 
     /**