diff --git a/examples/transport-querystring/hapi.js b/examples/transport-querystring/hapi.js
index 66df00aa..88ac52d0 100644
--- a/examples/transport-querystring/hapi.js
+++ b/examples/transport-querystring/hapi.js
@@ -1,7 +1,7 @@
 
 var Hapi = require('@hapi/hapi')
 var yar = require('@hapi/yar')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var grant = require('../../').hapi()
 
 
diff --git a/lib/client.js b/lib/client.js
index ede3c0d3..13f24e1d 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1,7 +1,7 @@
 
 var compose = require('request-compose')
 var oauth = require('request-oauth')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var pkg = require('../package')
 
 
diff --git a/lib/flow/oauth1.js b/lib/flow/oauth1.js
index e2e3f384..e1fb348f 100644
--- a/lib/flow/oauth1.js
+++ b/lib/flow/oauth1.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var request = require('../client')
 
 
diff --git a/lib/flow/oauth2.js b/lib/flow/oauth2.js
index dd8b593e..b11d5ce9 100644
--- a/lib/flow/oauth2.js
+++ b/lib/flow/oauth2.js
@@ -1,6 +1,6 @@
 
 var crypto = require('crypto')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var request = require('../client')
 
 
diff --git a/lib/handler/aws.js b/lib/handler/aws.js
index 73d4b332..59762f1b 100644
--- a/lib/handler/aws.js
+++ b/lib/handler/aws.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 var Session = require('../session')
 
diff --git a/lib/handler/azure.js b/lib/handler/azure.js
index 5a5f1df4..00a84857 100644
--- a/lib/handler/azure.js
+++ b/lib/handler/azure.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 var Session = require('../session')
 
diff --git a/lib/handler/curveball.js b/lib/handler/curveball.js
index f52d3886..d18daba3 100644
--- a/lib/handler/curveball.js
+++ b/lib/handler/curveball.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 
 
diff --git a/lib/handler/fastify.js b/lib/handler/fastify.js
index 24f10c1f..ddaeac4e 100644
--- a/lib/handler/fastify.js
+++ b/lib/handler/fastify.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 
 
diff --git a/lib/handler/gcloud.js b/lib/handler/gcloud.js
index d33291d6..f7af77eb 100644
--- a/lib/handler/gcloud.js
+++ b/lib/handler/gcloud.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 var Session = require('../session')
 
diff --git a/lib/handler/hapi-16.js b/lib/handler/hapi-16.js
index 8cc34c01..aa8a12b5 100644
--- a/lib/handler/hapi-16.js
+++ b/lib/handler/hapi-16.js
@@ -1,6 +1,6 @@
 
 var url = require('url')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 
 
diff --git a/lib/handler/hapi-17.js b/lib/handler/hapi-17.js
index b42a8b40..b214692e 100644
--- a/lib/handler/hapi-17.js
+++ b/lib/handler/hapi-17.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 
 
diff --git a/lib/handler/koa-1.js b/lib/handler/koa-1.js
index 17faf4e1..5a7d857f 100644
--- a/lib/handler/koa-1.js
+++ b/lib/handler/koa-1.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 
 
diff --git a/lib/handler/koa-2.js b/lib/handler/koa-2.js
index 96a7aa87..7e4cf068 100644
--- a/lib/handler/koa-2.js
+++ b/lib/handler/koa-2.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 
 
diff --git a/lib/handler/node.js b/lib/handler/node.js
index dcfb9978..5721ee37 100644
--- a/lib/handler/node.js
+++ b/lib/handler/node.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 var Session = require('../session')
 
diff --git a/lib/handler/vercel.js b/lib/handler/vercel.js
index d33291d6..f7af77eb 100644
--- a/lib/handler/vercel.js
+++ b/lib/handler/vercel.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var Grant = require('../grant')
 var Session = require('../session')
 
diff --git a/lib/response.js b/lib/response.js
index e67a0135..5143f04a 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -1,5 +1,5 @@
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 
 
 var tokens = (provider, response) => {
diff --git a/package.json b/package.json
index cc65c390..2b38a66b 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "url": "https://github.com/simov/grant.git"
   },
   "dependencies": {
-    "qs": "^6.14.0",
+    "neoqs": "^6.13.0",
     "request-compose": "^2.1.7",
     "request-oauth": "^1.0.1"
   },
diff --git a/test/client.js b/test/client.js
index 15e19575..0fa3f629 100644
--- a/test/client.js
+++ b/test/client.js
@@ -1,7 +1,7 @@
 
 var t = require('assert')
 var http = require('http')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var compose = require('request-compose')
 var request = require('../lib/client')
 
diff --git a/test/flow/oauth2.js b/test/flow/oauth2.js
index 4edba5e5..d0a4fe88 100644
--- a/test/flow/oauth2.js
+++ b/test/flow/oauth2.js
@@ -1,6 +1,6 @@
 
 var t = require('assert')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 
 var request = require('request-compose').extend({
   Request: {cookie: require('request-cookie').Request},
diff --git a/test/handler/handler.js b/test/handler/handler.js
index d05071f8..6d0cb3c8 100644
--- a/test/handler/handler.js
+++ b/test/handler/handler.js
@@ -1,6 +1,6 @@
 
 var t = require('assert')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 
 var request = require('request-compose').extend({
   Request: {cookie: require('request-cookie').Request},
diff --git a/test/handler/oidc.js b/test/handler/oidc.js
index e8ae7b40..fa61ed5f 100644
--- a/test/handler/oidc.js
+++ b/test/handler/oidc.js
@@ -9,7 +9,7 @@ var request = require('request-compose').extend({
 var Provider = require('../util/provider'), provider
 var Client = require('../util/client'), client
 
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var jws = require('jws')
 var oidc = require('../../lib/oidc')
 var keys = require('../util/keys')
diff --git a/test/handler/session.js b/test/handler/session.js
index c0f6646b..aac078cc 100644
--- a/test/handler/session.js
+++ b/test/handler/session.js
@@ -1,6 +1,6 @@
 
 var t = require('assert')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 
 var request = require('request-compose').extend({
   Request: {cookie: require('request-cookie').Request},
diff --git a/test/util/client.js b/test/util/client.js
index 5d31dd9b..9245fc64 100644
--- a/test/util/client.js
+++ b/test/util/client.js
@@ -2,7 +2,7 @@
 var t = require('assert')
 var http = require('http')
 var url = require('url')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 var cookie = require('cookie')
 
 var express = () => require('express')()
diff --git a/test/util/provider.js b/test/util/provider.js
index 3515f367..3589054a 100644
--- a/test/util/provider.js
+++ b/test/util/provider.js
@@ -1,7 +1,7 @@
 
 var http = require('http')
 var _url = require('url')
-var qs = require('qs')
+var qs = require('neoqs/legacy')
 
 var buffer = (req, done) => {
   var data = ''