diff --git a/plugins/guests/solaris11/cap/insert_public_key.rb b/plugins/guests/solaris11/cap/insert_public_key.rb
new file mode 100644
index 000000000..55087c366
--- /dev/null
+++ b/plugins/guests/solaris11/cap/insert_public_key.rb
@@ -0,0 +1,21 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestSolaris11
+    module Cap
+      class InsertPublicKey
+        def self.insert_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            comm.execute("mkdir -p ~/.ssh")
+            comm.execute("chmod 0700 ~/.ssh")
+            comm.execute("printf '#{contents}\\n' >> ~/.ssh/authorized_keys")
+            comm.execute("chmod 0600 ~/.ssh/authorized_keys")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/solaris11/cap/remove_public_key.rb b/plugins/guests/solaris11/cap/remove_public_key.rb
new file mode 100644
index 000000000..91924d3c5
--- /dev/null
+++ b/plugins/guests/solaris11/cap/remove_public_key.rb
@@ -0,0 +1,21 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestSolaris11
+    module Cap
+      class RemovePublicKey
+        def self.remove_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            if comm.test("test -f ~/.ssh/authorized_keys")
+              comm.execute(
+                "sed -i '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/solaris11/plugin.rb b/plugins/guests/solaris11/plugin.rb
index 707fd2bfc..1a5d07451 100644
--- a/plugins/guests/solaris11/plugin.rb
+++ b/plugins/guests/solaris11/plugin.rb
@@ -49,6 +49,16 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      guest_capability("solaris11", "insert_public_key") do
+        require_relative "cap/insert_public_key"
+        Cap::InsertPublicKey
+      end
+
+      guest_capability("solaris11", "remove_public_key") do
+        require_relative "cap/remove_public_key"
+        Cap::RemovePublicKey
+      end
     end
   end
 end