diff --git a/package.json b/package.json
index 1331ae2..825a245 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "libp2p": "^0.5.1",
     "libp2p-mdns": "^0.6.0",
     "libp2p-multiplex": "^0.3.5",
+    "libp2p-railing": "^0.4.0",
     "libp2p-secio": "^0.6.5",
     "libp2p-spdy": "^0.10.3",
     "libp2p-swarm": "^0.26.13",
@@ -70,4 +71,4 @@
     "greenkeeperio-bot <support@greenkeeper.io>",
     "varunagarwal315 <varunagarwal315@gmail.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/index.js b/src/index.js
index 8ae23dc..c9f063d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,6 +5,7 @@ const TCP = require('libp2p-tcp')
 const WebRTCStar = require('libp2p-webrtc-star')
 const MulticastDNS = require('libp2p-mdns')
 const WS = require('libp2p-websockets')
+const Railing = require('libp2p-railing')
 const spdy = require('libp2p-spdy')
 const multiplex = require('libp2p-multiplex')
 const secio = require('libp2p-secio')
@@ -42,7 +43,13 @@ class Node extends libp2p {
     }
 
     if (options.mdns) {
-      modules.discovery.push(new MulticastDNS(peerInfo, 'ipfs.local'))
+      const mdns = new MulticastDNS(peerInfo, 'ipfs.local')
+      modules.discovery.push(mdns)
+    }
+
+    if (options.bootstrap && process.env.IPFS_BOOTSTRAP) {
+      const r = new Railing(options.bootstrap)
+      modules.discovery.push(r)
     }
 
     super(modules, peerInfo, peerBook, options)