diff --git a/lib/rex/pescan/analyze.rb b/lib/rex/pescan/analyze.rb
index ce79e1d3da..baa488b691 100644
--- a/lib/rex/pescan/analyze.rb
+++ b/lib/rex/pescan/analyze.rb
@@ -218,8 +218,8 @@ module Analyze
 		def scan(param)
 			dest = param['dir']
 			
-			if (param['filename'])
-				dest = File.join(dest, File.basename(param['filename']))
+			if (param['file'])
+				dest = File.join(dest, File.basename(param['file']))
 			end
 			
 			FileUtils.mkdir_p(dest)
@@ -234,7 +234,48 @@ module Analyze
 			end	
 		end
 	end
+
+	class ContextMapDumper
+
+		attr_accessor :pe
 		
+		def initialize(pe)
+			self.pe = pe
+		end
+		
+		def scan(param)
+			dest = param['dir']
+			path = ''
+			
+			FileUtils.mkdir_p(dest)
+			
+			if(not (param['dir'] and param['file']))
+				$stderr.puts "No directory or file specified"
+				return
+			end
+			
+			if (param['file'])
+				path = File.join(dest, File.basename(param['file']) + ".map")
+			end
+
+			fd = File.new(path, "w")
+			pe.all_sections.each do |section|
+
+				# Skip over known bad sections
+				next if section.name == ".data"
+				next if section.name == ".reloc"
+				
+				data = section.read(0, section.size)
+				buff = [ 0x01, pe.rva_to_vma( section.base_rva ), data.length, data].pack("CVVA*")
+				
+				fd.write(buff)
+				
+			end
+			
+			fd.close
+		end
+	end
+			
 # EOC
 
 end
diff --git a/lib/rex/text.rb b/lib/rex/text.rb
index 6b0702ca61..48526220e5 100644
--- a/lib/rex/text.rb
+++ b/lib/rex/text.rb
@@ -743,7 +743,7 @@ module Text
 		if (buf.length < length)
 			buf = buf * (length / buf.length.to_f).ceil
 		end
-		
+
 		buf[0,length]
 	end
 
diff --git a/msfpescan b/msfpescan
index 4f93536204..376c37dbde 100755
--- a/msfpescan
+++ b/msfpescan
@@ -76,6 +76,10 @@ opt.on('-R', '--ripper [directory]', 'Rip all module resources to disk ') do |t|
 	param['dir'] = t
 end
 
+opt.on('--context-map [directory]', 'Generate context-map files') do |t|
+	worker = Rex::PeScan::Analyze::ContextMapDumper
+	param['dir'] = t
+end
 
 opt.separator('')
 opt.separator('Options:')
@@ -126,9 +130,7 @@ ARGV.each do |file|
 	if (param['imagebase'])
 		pe.image_base = param['imagebase'];
 	end
-	
-	param['filename'] = file
-	
+
 	o = worker.new(pe)
 	o.scan(param)