diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b77eaf75..d926db4d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,6 +127,8 @@ BUG FIXES:
   - push/heroku: use current branch [GH-6554]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]
+  - synced\_folders/smb: use credentials files to allow for more characters
+      in password [GH-4230]
 
 PLUGIN AUTHOR CHANGES:
 
diff --git a/plugins/guests/debian/cap/smb.rb b/plugins/guests/debian/cap/smb.rb
new file mode 100644
index 000000000..fcc97af36
--- /dev/null
+++ b/plugins/guests/debian/cap/smb.rb
@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module GuestDebian
+    module Cap
+      class SMB
+        def self.smb_install(machine)
+          # Deb/Ubuntu require mount.cifs which doesn't come by default.
+          machine.communicate.tap do |comm|
+            if !comm.test("test -f /sbin/mount.cifs")
+              machine.ui.detail(I18n.t("vagrant.guest_deb_installing_smb"))
+              comm.sudo("apt-get -y update")
+              comm.sudo("apt-get -y install cifs-utils")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/debian/plugin.rb b/plugins/guests/debian/plugin.rb
index 0ba72ed5d..5d00583e8 100644
--- a/plugins/guests/debian/plugin.rb
+++ b/plugins/guests/debian/plugin.rb
@@ -30,6 +30,11 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      guest_capability("debian", "smb_install") do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end
diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
index af96104e5..9db7c0ef3 100644
--- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb
+++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
@@ -24,17 +24,14 @@ module VagrantPlugins
             mount_gid = "`getent group #{options[:group]} | cut -d: -f3`"
             mount_gid_old = "`id -g #{options[:group]}`"
           end
-
-          smb_password = Shellwords.shellescape(options[:smb_password])
-
+          
           # If a domain is provided in the username, separate it
           username, domain = (options[:smb_username] || '').split('@', 2)
+          smb_password = options[:smb_password]
 
           options[:mount_options] ||= []
           options[:mount_options] << "sec=ntlm"
-          options[:mount_options] << "username=#{username}"
-          options[:mount_options] << "password=#{smb_password}"
-          options[:mount_options] << "domain=#{domain}" if domain
+          options[:mount_options] << "credentials=/etc/smb_creds_#{name}"
 
           # First mount command uses getent to get the group
           mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
@@ -49,6 +46,16 @@ module VagrantPlugins
           # Create the guest path if it doesn't exist
           machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
 
+          # Write the credentials file
+          machine.communicate.sudo(<<-SCRIPT)
+cat <<EOF >/etc/smb_creds_#{name}
+username=#{username}
+password=#{smb_password}
+#{domain ? "domain=#{domain}" : ""}
+EOF
+chmod 0600 /etc/smb_creds_#{name}
+SCRIPT
+
           # Attempt to mount the folder. We retry here a few times because
           # it can fail early on.
           attempts = 0
diff --git a/plugins/synced_folders/smb/synced_folder.rb b/plugins/synced_folders/smb/synced_folder.rb
index e3f5a1af2..e74d2fbbf 100644
--- a/plugins/synced_folders/smb/synced_folder.rb
+++ b/plugins/synced_folders/smb/synced_folder.rb
@@ -92,6 +92,11 @@ module VagrantPlugins
             guest: machine.guest.name.to_s
         end
 
+        # Setup if we have it
+        if machine.guest.capability?(:smb_install)
+          machine.guest.capability(:smb_install)
+        end
+
         # Detect the host IP for this guest if one wasn't specified
         # for every folder.
         host_ip = nil
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 60c7e3838..0b93f9c79 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -160,6 +160,8 @@ en:
       description of what they do.
 
       %{list}
+    guest_deb_installing_smb: |-
+      Installing SMB "mount.cifs"...
     global_status_footer: |-
       The above shows information about all known Vagrant environments
       on this machine. This data is cached and may not be completely