diff --git a/index.js b/index.js
index fda674f..7fbc7e5 100644
--- a/index.js
+++ b/index.js
@@ -41,10 +41,11 @@ KoaOAuthServer.prototype.authenticate = function() {
 
   return function *(next) {
     var request = new Request(this.request);
+    var response = new Response(this.response);
 
     try {
       this.state.oauth = {
-        token: yield server.authenticate(request)
+        token: yield server.authenticate(request, response)
       };
     } catch (e) {
       return handleError.call(this, e);
@@ -62,7 +63,7 @@ KoaOAuthServer.prototype.authenticate = function() {
  * (See: https://tools.ietf.org/html/rfc6749#section-3.1)
  */
 
-KoaOAuthServer.prototype.authorize = function() {
+KoaOAuthServer.prototype.authorize = function(options) {
   var server = this.server;
 
   return function *(next) {
@@ -71,7 +72,7 @@ KoaOAuthServer.prototype.authorize = function() {
 
     try {
       this.state.oauth = {
-        code: yield server.authorize(request, response)
+        code: yield server.authorize(request, response, options)
       };
 
       handleResponse.call(this, response);
diff --git a/package.json b/package.json
index b21df78..0d53ba6 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "co": "^4.5.1",
-    "oauth2-server": "seegno-forks/node-oauth2-server#enhancement/refactor-project"
+    "oauth2-server": "^3.0.0-b2"
   },
   "devDependencies": {
     "co-mocha": "^1.1.0",