diff --git a/modules/auxiliary/admin/oracle/droptable_trigger.rb b/modules/auxiliary/admin/oracle/droptable_trigger.rb
index 58f9cee7fd..d3b06f3af0 100644
--- a/modules/auxiliary/admin/oracle/droptable_trigger.rb
+++ b/modules/auxiliary/admin/oracle/droptable_trigger.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: droptable_trigger.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb b/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
index 189dccd114..74d0d1c8ad 100644
--- a/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
+++ b/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
@@ -1,5 +1,5 @@
 ##
-# $Id:
+# $Id$
 ##
 
 ##
diff --git a/modules/auxiliary/scanner/nfs/nfsmount.rb b/modules/auxiliary/scanner/nfs/nfsmount.rb
index 3a8d3fce39..307fdab289 100644
--- a/modules/auxiliary/scanner/nfs/nfsmount.rb
+++ b/modules/auxiliary/scanner/nfs/nfsmount.rb
@@ -1,5 +1,5 @@
 ##
-# $Id:
+# $Id$
 ##
 
 ##
diff --git a/modules/auxiliary/scanner/rogue/rogue_recv.rb b/modules/auxiliary/scanner/rogue/rogue_recv.rb
index c6832b8fe3..64a8bf064e 100644
--- a/modules/auxiliary/scanner/rogue/rogue_recv.rb
+++ b/modules/auxiliary/scanner/rogue/rogue_recv.rb
@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Auxiliary
 			},
 			'Author'      => 'hdm',
 			'License'     => MSF_LICENSE,
-			'Version'     => '$Revision: 7197',
+			'Version'     => '$Revision$',
 			'References'  =>
 				[
 					['URL', 'http://www.metasploit.com/research/projects/rogue_network/'],
diff --git a/modules/auxiliary/scanner/rogue/rogue_send.rb b/modules/auxiliary/scanner/rogue/rogue_send.rb
index fa10a94618..c999418023 100644
--- a/modules/auxiliary/scanner/rogue/rogue_send.rb
+++ b/modules/auxiliary/scanner/rogue/rogue_send.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Auxiliary
 			},
 			'Author'      => 'hdm',
 			'License'     => MSF_LICENSE,
-			'Version'     => '$Revision: 7197',
+			'Version'     => '$Revision$',
 			'References'  =>
 				[
 					['URL', 'http://www.metasploit.com/research/projects/rogue_network/'],
diff --git a/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb b/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb
index 91c110441a..f01f07d223 100644
--- a/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb
+++ b/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: hagent_untrusted_hsdata.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/brightstor/etrust_itm_alert.rb b/modules/exploits/windows/brightstor/etrust_itm_alert.rb
index 955ccba88b..53eb649da9 100644
--- a/modules/exploits/windows/brightstor/etrust_itm_alert.rb
+++ b/modules/exploits/windows/brightstor/etrust_itm_alert.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: etrust_itm_alert.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb b/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb
index 8be2fe4382..eb2062f191 100644
--- a/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb
+++ b/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: lgserver_rxrlogin.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb b/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb
index 71c0c463da..9dd0892c56 100644
--- a/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb
+++ b/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: lgserver_rxsuselicenseini.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/browser/amaya_bdo.rb b/modules/exploits/windows/browser/amaya_bdo.rb
index e8825b6371..db613eb8a8 100644
--- a/modules/exploits/windows/browser/amaya_bdo.rb
+++ b/modules/exploits/windows/browser/amaya_bdo.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: amaya_bdo.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/misc/bigant_server.rb b/modules/exploits/windows/misc/bigant_server.rb
index 37d7b5865a..03aae96fc4 100644
--- a/modules/exploits/windows/misc/bigant_server.rb
+++ b/modules/exploits/windows/misc/bigant_server.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: bigant_server.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/mysql/mysql_yassl.rb b/modules/exploits/windows/mysql/mysql_yassl_hello.rb
similarity index 99%
rename from modules/exploits/windows/mysql/mysql_yassl.rb
rename to modules/exploits/windows/mysql/mysql_yassl_hello.rb
index 86b7c87637..a9f824c044 100644
--- a/modules/exploits/windows/mysql/mysql_yassl.rb
+++ b/modules/exploits/windows/mysql/mysql_yassl_hello.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: 
+# $Id$
 ##
 
 ##
diff --git a/modules/exploits/windows/novell/groupwisemessenger_client.rb b/modules/exploits/windows/novell/groupwisemessenger_client.rb
index 20a3ff71dc..292fcd0d44 100644
--- a/modules/exploits/windows/novell/groupwisemessenger_client.rb
+++ b/modules/exploits/windows/novell/groupwisemessenger_client.rb
@@ -1,5 +1,5 @@
 ##
-# $Id: groupwisemessenger_client.rb
+# $Id$
 ##
 
 ##
diff --git a/modules/payloads/stagers/windows/x64/bind_tcp.rb b/modules/payloads/stagers/windows/x64/bind_tcp.rb
index 310f793b19..7b1eaeee7f 100644
--- a/modules/payloads/stagers/windows/x64/bind_tcp.rb
+++ b/modules/payloads/stagers/windows/x64/bind_tcp.rb
@@ -22,7 +22,7 @@ module Metasploit3
 	def initialize(info = {})
 		super(merge_info(info,
 			'Name'          => 'Windows x64 Bind TCP Stager',
-			'Version'       => '$Revision',
+			'Version'       => '$Revision$',
 			'Description'   => 'Listen for a connection (Windows x64)',
 			'Author'        => [ 'sf' ],
 			'License'       => MSF_LICENSE,
diff --git a/scripts/meterpreter/get_pidgin_creds.rb b/scripts/meterpreter/get_pidgin_creds.rb
index abbf867a12..0c6c3ecf7f 100644
--- a/scripts/meterpreter/get_pidgin_creds.rb
+++ b/scripts/meterpreter/get_pidgin_creds.rb
@@ -1,4 +1,7 @@
-#$Id$
+##
+# $Id$
+##
+
 require "rexml/document"
 
 #-------------------------------------------------------------------------------