diff --git a/Gemfile b/Gemfile
index 8d6a8427e4..8260533cb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,8 +33,8 @@ gem "bcrypt", "~> 3.1.11", require: false
 # sprockets.
 gem "uglifier", ">= 1.3.0", require: false
 
-# FIXME: Remove this fork after https://github.com/nex3/rb-inotify/pull/49 is fixed.
-gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
+# FIXME: Pending rb-inotify 0.9.9 release
+gem "rb-inotify", github: "guard/rb-inotify", branch: "master", require: false
 
 # Explicitly avoid 1.x that doesn't support Ruby 2.4+
 gem "json", ">= 2.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 15e5607b3b..22418fa5e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,12 +7,12 @@ GIT
       pg (>= 0.17, < 0.20)
 
 GIT
-  remote: https://github.com/matthewd/rb-inotify.git
-  revision: 90553518d1fb79aedc98a3036c59bd2b6731ac40
-  branch: close-handling
+  remote: https://github.com/guard/rb-inotify.git
+  revision: 7e3c714a09ae2b38d2620835e794150d8857cd49
+  branch: master
   specs:
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    rb-inotify (0.9.9)
+      ffi (~> 1.0)
 
 GIT
   remote: https://github.com/matthewd/websocket-client-simple.git