diff --git a/config.yaml b/config.yaml
index 66080a9b..1b4240a6 100644
--- a/config.yaml
+++ b/config.yaml
@@ -317,8 +317,11 @@ options:
       Enabling this option will attempt to tune your network card sysctls and
       hard drive settings. This changes hard drive read ahead settings and
       max_sectors_kb. For the network card this will detect the link speed
-      and make appropriate sysctl changes. Enabling this option should
-      generally be safe.
+      and make appropriate sysctl changes.
+      WARNING: This option is DEPRECATED and will be removed in the next release.
+      Exercise caution when enabling this feature; examine and
+      confirm sysctl values are appropriate for your environment. See
+      http://pad.lv/1798794 for a full discussion.
   aa-profile-mode:
     type: string
     default: 'disable'
diff --git a/hooks/ceph_hooks.py b/hooks/ceph_hooks.py
index 51c41c21..a4816d60 100755
--- a/hooks/ceph_hooks.py
+++ b/hooks/ceph_hooks.py
@@ -316,6 +316,8 @@ def install():
     apt_update(fatal=True)
     apt_install(packages=ceph.determine_packages(), fatal=True)
     if config('autotune'):
+        log('The autotune config is deprecated and planned '
+            'for removal in the next release.', level=WARNING)
         tune_network_adapters()
     install_udev_rules()
 
@@ -547,6 +549,8 @@ def prepare_disks_and_activate():
                         config('osd-encrypt-keymanager'))
             # Make it fast!
             if config('autotune'):
+                log('The autotune config is deprecated and planned '
+                    'for removal in the next release.', level=WARNING)
                 ceph.tune_dev(dev)
         ceph.start_osds(get_devices())