diff --git a/modules/auxiliary/scanner/http/wordpress_scanner.rb b/modules/auxiliary/scanner/http/wordpress_scanner.rb
new file mode 100644
index 0000000000..12b6e50777
--- /dev/null
+++ b/modules/auxiliary/scanner/http/wordpress_scanner.rb
@@ -0,0 +1,39 @@
+##
+# This module requires Metasploit: http//metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core'
+
+class Metasploit3 < Msf::Auxiliary
+  include Msf::HTTP::Wordpress
+  include Msf::Auxiliary::Scanner
+  include Msf::Auxiliary::Report
+
+  def initialize
+    super(
+      'Name'        => 'Wordpress Scanner',
+      'Description' => 'Detects Wordpress Installations and their version number',
+      'Author'      => [ 'Christian Mehlmauer <FireFart[at]gmail.com>' ],
+      'License'     => MSF_LICENSE
+    )
+  end
+
+  def run_host(target_host)
+    print_status("Trying ip #{target_host}")
+    if wordpress_and_online?
+      version = wordpress_version
+      version_string = version ? version : '(no version detected)'
+      print_good("#{target_host} running Wordpress #{version_string}")
+      report_note(
+          {
+              :host   => target_host,
+              :proto  => 'tcp',
+              :sname => (ssl ? 'https' : 'http'),
+              :port   => rport,
+              :type   => "Wordpress #{version_string}",
+              :data   => target_uri
+          })
+    end
+  end
+end