diff --git a/documentation/modules/post/windows/manage/autoroute.md b/documentation/modules/post/multi/manage/autoroute.md
similarity index 98%
rename from documentation/modules/post/windows/manage/autoroute.md
rename to documentation/modules/post/multi/manage/autoroute.md
index f9a51b891e..de42281f1e 100644
--- a/documentation/modules/post/windows/manage/autoroute.md
+++ b/documentation/modules/post/multi/manage/autoroute.md
@@ -84,13 +84,13 @@ You need a Windows Meterpreter session on a host that has a different public IP
 First set up a default route for the Meterpreter session.
 
 ```
-meterpreter > run post/windows/manage/autoroute CMD=default
+meterpreter > run post/multi/manage/autoroute CMD=default
 ```
 
 or
 
 ```
-msf > use post/windows/manage/autoroute
+msf > use post/multi/manage/autoroute
 msf post(autoroute) > set SESSION session-id
 msf post(autoroute) > set CMD default
 msf post(autoroute) > exploit
diff --git a/lib/msf/base/sessions/scriptable.rb b/lib/msf/base/sessions/scriptable.rb
index 01af316541..d136f9a396 100644
--- a/lib/msf/base/sessions/scriptable.rb
+++ b/lib/msf/base/sessions/scriptable.rb
@@ -56,7 +56,7 @@ module Scriptable
   #
   def legacy_script_to_post_module(script_name)
     {
-      'autoroute' => 'post/windows/manage/autoroute',
+      'autoroute' => 'post/multi/manage/autoroute',
       'checkvm' => 'post/windows/gather/checkvm',
       'duplicate' => 'post/windows/manage/multi_meterpreter_inject',
       'enum_chrome' => 'post/windows/gather/enum_chrome',
@@ -68,7 +68,7 @@ module Scriptable
       'file_collector' => 'post/windows/gather/enum_files',
       'get_application_list' => 'post/windows/gather/enum_applications',
       'get_filezilla_creds' => 'post/windows/gather/credentials/filezilla_server',
-      'get_local_subnets' => 'post/windows/manage/autoroute',
+      'get_local_subnets' => 'post/multi/manage/autoroute',
       'get_valid_community' => 'post/windows/gather/enum_snmp',
       'getcountermeasure' => 'post/windows/manage/killav',
       'getgui' => 'post/windows/manage/enable_rdp',
diff --git a/modules/post/windows/manage/autoroute.rb b/modules/post/multi/manage/autoroute.rb
similarity index 99%
rename from modules/post/windows/manage/autoroute.rb
rename to modules/post/multi/manage/autoroute.rb
index e281b891fe..57a91f601a 100644
--- a/modules/post/windows/manage/autoroute.rb
+++ b/modules/post/multi/manage/autoroute.rb
@@ -6,7 +6,6 @@
 
 class MetasploitModule < Msf::Post
 
-
   def initialize(info={})
     super( update_info( info,
         'Name'          => 'Windows Manage Network Route via Meterpreter Session',
@@ -24,7 +23,6 @@ class MetasploitModule < Msf::Post
              'todb',
              'Josh Hale <jhale85446[at]gmail.com>'
            ],
-        'Platform'      => [ 'win' ],
         'SessionTypes'  => [ 'meterpreter']
       ))
 
diff --git a/scripts/meterpreter/autoroute.rb b/scripts/meterpreter/autoroute.rb
index 51af8b7c5d..8ca2dc6379 100644
--- a/scripts/meterpreter/autoroute.rb
+++ b/scripts/meterpreter/autoroute.rb
@@ -145,7 +145,7 @@ def usage()
   print_status "  run autoroute -p                            # Print active routing table"
   print_status "  run autoroute -d -s 10.10.10.1              # Deletes the 10.10.10.1/255.255.255.0 route"
   print_status "Use the \"route\" and \"ipconfig\" Meterpreter commands to learn about available routes"
-  print_error "Deprecation warning: This script has been replaced by the post/windows/manage/autoroute module"
+  print_error "Deprecation warning: This script has been replaced by the post/multi/manage/autoroute module"
 end
 
 # Validates the command options