diff --git a/README.md b/README.md
index 6b0242aec7..0bbe2b294e 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ no_proxy | NO_PROXY environment variable | String | nil
 options | Additional options to pass to docker. These could be flags like "-api-enable-cors". | String | nil
 pidfile | Path to use for daemon PID file | String | nil (implicitly /var/run/docker.pid)
 ramdisk | Set DOCKER_RAMDISK when using RAM disk | TrueClass or FalseClass | false
-restart | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
+restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
 selinux_enabled | Enable SELinux | TrueClass or FalseClass | nil
 storage_driver | Storage driver for docker | String | nil
 storage_opt | Storage driver options | String, Array | nil
diff --git a/attributes/default.rb b/attributes/default.rb
index 8e739c539c..eee03ec2d8 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -186,4 +186,5 @@
 
 # Other attributes
 
+# DEPRECATED: will be removed in chef-docker 1.0
 default['docker']['restart'] = false if node['docker']['container_init_type']
diff --git a/spec/systemd_spec.rb b/spec/systemd_spec.rb
index 3cad9b4c20..3b173d9dea 100644
--- a/spec/systemd_spec.rb
+++ b/spec/systemd_spec.rb
@@ -87,6 +87,7 @@
     end
   end
 
+  # DEPRECATED: will be removed in chef-docker 1.0
   context 'when container_init_type is set' do
     let(:chef_run) do
       runner = ChefSpec::Runner.new
diff --git a/spec/sysv_spec.rb b/spec/sysv_spec.rb
index 3debd590b2..6fe5216d44 100644
--- a/spec/sysv_spec.rb
+++ b/spec/sysv_spec.rb
@@ -98,6 +98,7 @@
     end
   end
 
+  # DEPRECATED: will be removed in chef-docker 1.0
   context 'when container_init_type is set' do
     let(:chef_run) do
       runner = ChefSpec::Runner.new
diff --git a/spec/upstart_spec.rb b/spec/upstart_spec.rb
index ee9e460fe6..732bfdc747 100644
--- a/spec/upstart_spec.rb
+++ b/spec/upstart_spec.rb
@@ -99,6 +99,7 @@
     end
   end
 
+  # DEPRECATED: will be removed in chef-docker 1.0
   context 'when container_init_type is set' do
     let(:chef_run) do
       runner = ChefSpec::Runner.new