diff --git a/grunt.js b/grunt.js
index d1a8c46e9..152cef351 100644
--- a/grunt.js
+++ b/grunt.js
@@ -14,19 +14,20 @@ module.exports = function(grunt) {
       sjcl: {
         src: [
           "src/js/sjcl/core/sjcl.js",
-//          "src/js/sjcl/core/aes.js",
+          "src/js/sjcl/core/aes.js",
           "src/js/sjcl/core/bitArray.js",
           "src/js/sjcl/core/codecString.js",
           "src/js/sjcl/core/codecHex.js",
           "src/js/sjcl/core/codecBase64.js",
           "src/js/sjcl/core/codecBytes.js",
           "src/js/sjcl/core/sha256.js",
+          "src/js/sjcl/core/sha512.js",
           "src/js/sjcl/core/sha1.js",
-//          "src/js/sjcl/core/ccm.js",
+          "src/js/sjcl/core/ccm.js",
 //          "src/js/sjcl/core/cbc.js",
 //          "src/js/sjcl/core/ocb2.js",
-//          "src/js/sjcl/core/hmac.js",
-//          "src/js/sjcl/core/pbkdf2.js",
+          "src/js/sjcl/core/hmac.js",
+          "src/js/sjcl/core/pbkdf2.js",
           "src/js/sjcl/core/random.js",
           "src/js/sjcl/core/convenience.js",
           "src/js/sjcl/core/bn.js",
diff --git a/src/js/index.js b/src/js/index.js
index 2d6e65f71..563edb9c5 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1,4 +1,13 @@
 exports.Remote = require('./remote').Remote;
 exports.Amount = require('./amount').Amount;
 exports.UInt160 = require('./amount').UInt160;
-exports.Seed = require('./amount').Seed;
\ No newline at end of file
+exports.Seed = require('./amount').Seed;
+
+// Important: We do not guarantee any specific version of SJCL or for any
+// specific features to be included. The version and configuration may change at
+// any time without warning.
+//
+// However, for programs that are tied to a specific version of ripple.js like
+// the official client, it makes sense to expose the SJCL instance so we don't
+// have to include it twice.
+exports.sjcl = require('../../build/sjcl');
diff --git a/src/js/sjcl b/src/js/sjcl
index d04d0bdcc..dbdef434e 160000
--- a/src/js/sjcl
+++ b/src/js/sjcl
@@ -1 +1 @@
-Subproject commit d04d0bdccd986e434b98fe393e1e01286c10fc36
+Subproject commit dbdef434e76c3f16835f3126a7ff1c717b1ce8af