diff --git a/nassh/_locales/en/messages.json b/nassh/_locales/en/messages.json
index 9561ba5c2..b38137861 100644
--- a/nassh/_locales/en/messages.json
+++ b/nassh/_locales/en/messages.json
@@ -425,6 +425,10 @@
 		"description": "Helpful tip shown to user advertising features",
 		"message": "You can rebind keys/shortcuts: https://goo.gl/LWRndr"
 	},
+	"TIP_12": {
+		"description": "Helpful tip shown to user advertising features",
+		"message": "Use Yubikeys and other smart cards for ssh auth: https://goo.gl/3ZEU1w"
+	},
 	"UNEXPECTED_ERROR": {
 		"description": "Generic message displayed when we encounter an unexpected error.",
 		"message": "An unexpected error occurred, please check the JavaScript console for more details."
diff --git a/nassh/concat/release-highlights.txt b/nassh/concat/release-highlights.txt
index 05b1d4945..0c1a991f5 100644
--- a/nassh/concat/release-highlights.txt
+++ b/nassh/concat/release-highlights.txt
@@ -17,3 +17,7 @@
 # release: 0.8.36.11 (stable August 29)
 % The SSH command line can handle basic quoting rules (e.g. -o "Feature yes").
 % Unicode combining character processing has been overhauled.
+
+# release: 0.8.37
+% Unicode tables updated to 10.0.0 release.
+% Use Yubikeys and other smart cards for ssh auth: https://goo.gl/3ZEU1w
diff --git a/nassh/doc/ChangeLog.md b/nassh/doc/ChangeLog.md
index 668d35a23..bfd4be2eb 100644
--- a/nassh/doc/ChangeLog.md
+++ b/nassh/doc/ChangeLog.md
@@ -1,3 +1,16 @@
+# 0.8.37, 2017-09-12, Unicode updates and ssh-agent frameworks.
+
+* Update to libdot 1.18.  Unicode 10.0.0 updates (from Unicode 5).
+* Update to hterm 1.72.  Misc bugfixes.
+* Implement an extensible SSH agent (stub backend).
+* Integrate Google Smart Card Connector client.
+* Add an agent backend for smart card keys.
+* Also set relay page to black background.
+* Fail gracefully when loading an unknown profile.
+* Fix argstr parsing when connecting via URIs.
+* Fix opening a new window from the omnibox.
+* Use lib.f.getStack helper in more places.
+
 # 0.8.36.12, 2017-09-01, Bugfixes galore.
 
 * Update to libdot 1.17.  Better handling for Unicode combining characters.
diff --git a/nassh/js/nassh_command_instance.js b/nassh/js/nassh_command_instance.js
index 311cccbf0..c590cfe5b 100644
--- a/nassh/js/nassh_command_instance.js
+++ b/nassh/js/nassh_command_instance.js
@@ -164,7 +164,7 @@ nassh.CommandInstance.prototype.run = function() {
     }
 
     // Display a random tip every time they launch to advertise features.
-    var num = lib.f.randomInt(1, 11);
+    var num = lib.f.randomInt(1, 12);
     this.io.println('');
     this.io.println(nassh.msg('WELCOME_TIP_OF_DAY',
                               [num, nassh.msg(`TIP_${num}`)]));
diff --git a/nassh/manifest.json b/nassh/manifest.json
index 837998bcd..59466d272 100644
--- a/nassh/manifest.json
+++ b/nassh/manifest.json
@@ -4,7 +4,7 @@
   "manifest_version": 2,
   "content_security_policy": "script-src 'self'; object-src 'self'",
   "name": "Secure Shell (tot)",
-  "version": "0.8.36.12",
+  "version": "0.8.37",
   "default_locale": "en",
   "icons": {
     "128": "images/dev/icon-128.png",