diff --git a/CHANGELOG.md b/CHANGELOG.md
index af370f21f..87e62cc9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ## 1.2.0 (unreleased)
 
+IMPROVEMENTS:
 
+  - By adding the "disabled" boolean flag to synced folders you can disable
+    them altogether. [GH-1004]
 
 ## 1.1.6 (April 3, 2013)
 
diff --git a/plugins/providers/virtualbox/action/share_folders.rb b/plugins/providers/virtualbox/action/share_folders.rb
index a5122bd1b..9dd394c0c 100644
--- a/plugins/providers/virtualbox/action/share_folders.rb
+++ b/plugins/providers/virtualbox/action/share_folders.rb
@@ -2,10 +2,14 @@ require "pathname"
 
 require "log4r"
 
+require "vagrant/util/scoped_hash_override"
+
 module VagrantPlugins
   module ProviderVirtualBox
     module Action
       class ShareFolders
+        include Vagrant::Util::ScopedHashOverride
+
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant::action::vm::share_folders")
           @app    = app
@@ -27,9 +31,14 @@ module VagrantPlugins
         def shared_folders
           {}.tap do |result|
             @env[:machine].config.vm.synced_folders.each do |id, data|
+              data = scoped_hash_override(data, :virtualbox)
+
               # Ignore NFS shared folders
               next if data[:nfs]
 
+              # Ignore disabled shared folders
+              next if data[:disabled]
+
               # This to prevent overwriting the actual shared folders data
               result[id] = data.dup
             end