diff --git a/lib/grant-types/authorization-code-grant-type.js b/lib/grant-types/authorization-code-grant-type.js
index a3e4e12bf..bad45a6cd 100644
--- a/lib/grant-types/authorization-code-grant-type.js
+++ b/lib/grant-types/authorization-code-grant-type.js
@@ -184,12 +184,18 @@ AuthorizationCodeGrantType.prototype.revokeAuthorizationCode = function(code) {
  */
 
 AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authorizationCode, scope) {
-  return this.generateAccessToken()
+  const fns = [
+    this.generateAccessToken(),
+    this.generateRefreshToken()
+  ];
+
+  return Promise.all(fns)
     .bind(this)
-    .then(function(accessToken) {
+    .spread(function(accessToken, refreshToken) {
       var token = {
         accessToken: accessToken,
         authorizationCode: authorizationCode,
+        refreshToken: refreshToken,
         scope: scope
       };
 
diff --git a/test/unit/grant-types/authorization-code-grant-type_test.js b/test/unit/grant-types/authorization-code-grant-type_test.js
index d2dee9822..d50ac159a 100644
--- a/test/unit/grant-types/authorization-code-grant-type_test.js
+++ b/test/unit/grant-types/authorization-code-grant-type_test.js
@@ -67,12 +67,13 @@ describe('AuthorizationCodeGrantType', function() {
       var handler = new AuthorizationCodeGrantType({ accessTokenLifetime: 120, model: model });
 
       sinon.stub(handler, 'generateAccessToken').returns(Promise.resolve('foo'));
+      sinon.stub(handler, 'generateRefreshToken').returns(Promise.resolve('bar'));
 
       return handler.saveToken(user, client, 'foobar', 'foobiz')
         .then(function() {
           model.saveToken.callCount.should.equal(1);
           model.saveToken.firstCall.args.should.have.length(3);
-          model.saveToken.firstCall.args[0].should.eql({ accessToken: 'foo', authorizationCode: 'foobar', scope: 'foobiz' });
+          model.saveToken.firstCall.args[0].should.eql({ accessToken: 'foo', authorizationCode: 'foobar', refreshToken: 'bar', scope: 'foobiz' });
           model.saveToken.firstCall.args[1].should.equal(client);
           model.saveToken.firstCall.args[2].should.equal(user);
         })