diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js
index 492d06d7e..7b4334c24 100644
--- a/lib/commands/admin-rpc.js
+++ b/lib/commands/admin-rpc.js
@@ -2,6 +2,7 @@
 const nThen = require("nthen");
 const getFolderSize = require("get-folder-size");
 const Util = require("../common-util");
+const Ulimit = require("ulimit");
 
 var Fs = require("fs");
 
@@ -14,6 +15,10 @@ var getFileDescriptorCount = function (Env, server, cb) {
     });
 };
 
+var getFileDescriptorLimit = function (env, server, cb) {
+    Ulimit(cb);
+};
+
 var getActiveSessions = function (Env, Server, cb) {
     var stats = Server.getSessionStats();
     cb(void 0, [
@@ -113,6 +118,7 @@ var commands = {
     FLUSH_CACHE: flushCache,
     SHUTDOWN: shutdown,
     GET_FILE_DESCRIPTOR_COUNT: getFileDescriptorCount,
+    GET_FILE_DESCRIPTOR_LIMIT: getFileDescriptorLimit,
 };
 
 Admin.command = function (Env, safeKey, data, _cb, Server) {
diff --git a/package-lock.json b/package-lock.json
index 6cafde975..f86eb6eb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1244,6 +1244,11 @@
         "mime-types": "~2.1.24"
       }
     },
+    "ulimit": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/ulimit/-/ulimit-0.0.2.tgz",
+      "integrity": "sha1-K1H53IOBrkECY2zsXrM4wmMFiKA="
+    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
diff --git a/package.json b/package.json
index 51bfec3f7..c3999f893 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "sortify": "^1.0.4",
     "stream-to-pull-stream": "^1.7.2",
     "tweetnacl": "~0.12.2",
+    "ulimit": "0.0.2",
     "ws": "^3.3.1"
   },
   "devDependencies": {