diff --git a/lib/msf/core/rpc/job.rb b/lib/msf/core/rpc/job.rb
index 763bde770a..e88fa0f586 100644
--- a/lib/msf/core/rpc/job.rb
+++ b/lib/msf/core/rpc/job.rb
@@ -28,7 +28,19 @@ class Job < Base
 		if(not obj)
 			raise ::XMLRPC::FaultException.new(404, "no such job")
 		else
-			info = obj.info
+			info = {
+				"jid"  => obj.jid,
+				"name" => obj.name,
+				"start_time" => obj.start_time
+			}
+			if obj.ctx && obj.ctx[0] 
+				if obj.ctx[0].respond_to?(:get_resource)
+					info['uripath'] = obj.ctx[0].get_resource
+				end
+				if obj.ctx[0].respond_to?(:datastore)
+					info['datastore'] = obj.ctx[0].datastore
+				end
+			end
 			{ "result" => "success" , "info" => info}
 		end
 	end
diff --git a/lib/rex/job_container.rb b/lib/rex/job_container.rb
index db7a2a4259..92a71147a2 100644
--- a/lib/rex/job_container.rb
+++ b/lib/rex/job_container.rb
@@ -83,7 +83,6 @@ class Job
 
 protected
 
-	attr_writer   :info #:nodoc:
 	attr_writer   :name #:nodoc:
 	attr_writer   :jid #:nodoc:
 	attr_accessor :job_thread #:nodoc: