diff --git a/lib/msf/core.rb b/lib/msf/core.rb
index 157533bec9..ba9b21ac40 100644
--- a/lib/msf/core.rb
+++ b/lib/msf/core.rb
@@ -19,6 +19,7 @@ require 'rex/ui'
 
 module Msf
   autoload :Author, 'msf/core/author'
+  autoload :Platform, 'msf/core/platform'
   autoload :Reference, 'msf/core/reference'
   autoload :SiteReference, 'msf/core/site_reference'
 
diff --git a/lib/msf/core/module.rb b/lib/msf/core/module.rb
index f771641e8c..a5b0314f28 100644
--- a/lib/msf/core/module.rb
+++ b/lib/msf/core/module.rb
@@ -538,7 +538,6 @@ end
 # Alias the data types so people can reference them just by Msf:: and not
 # Msf::Module::
 #
-Platform = Msf::Module::Platform
 Target = Msf::Module::Target
 
 end
diff --git a/lib/msf/core/platform.rb b/lib/msf/core/platform.rb
new file mode 100644
index 0000000000..15bc889b29
--- /dev/null
+++ b/lib/msf/core/platform.rb
@@ -0,0 +1 @@
+Msf::Platform = Msf::Module::Platform