diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8357101e88..0360e49ee9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -47,6 +47,8 @@ in development
   backends can advertise functionality they support (e.g. authenticate a user, retrieve information
   about a particular user, retrieve a list of groups a particular user is a member of).
   (new feature)
+* Linux file watch sensor is now disabled by default. To enable it, set ``enabled: true`` in
+  ``/opt/stackstorm/packs/linux/sensors/file_watch_sensor.yaml``
 
 2.2.0 - February 27, 2017
 -------------------------
diff --git a/contrib/linux/sensors/file_watch_sensor.yaml b/contrib/linux/sensors/file_watch_sensor.yaml
index dbfd48a8ac..fd445e156d 100644
--- a/contrib/linux/sensors/file_watch_sensor.yaml
+++ b/contrib/linux/sensors/file_watch_sensor.yaml
@@ -1,5 +1,6 @@
 ---
   class_name: "FileWatchSensor"
+  enabled: false
   entry_point: "file_watch_sensor.py"
   description: "Sensor which monitors files for new lines"
   trigger_types: