diff --git a/.gitmodules b/.gitmodules
index ef82c9ef..02505d60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "modules/zsh-notify/external"]
 	path = modules/zsh-notify/external
 	url = https://github.com/marzocchi/zsh-notify.git
+[submodule "modules/autoenv/external"]
+	path = modules/autoenv/external
+	url = https://github.com/horosgrisa/autoenv
diff --git a/modules/autoenv/README.md b/modules/autoenv/README.md
new file mode 100644
index 00000000..64cf820f
--- /dev/null
+++ b/modules/autoenv/README.md
@@ -0,0 +1,16 @@
++autoenv
+====
+
+[autoenv][1] automatically sources (known/whitelisted) .env and .out files.
+
+Authors
+-------
+
+The iauthors of this module should be contacted via the [issue tracker][2].
+
+    - [Rui Coelho](https://github.com/rjcoelho)
+    - [Grigorii Horos](https://github.com/horosgrisa)
+    - [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+ [1]: https://github.com/horosgrisa/autoenv
+ [2]: https://github.com/sorin-ionescu/prezto/issues
diff --git a/modules/autoenv/external b/modules/autoenv/external
new file mode 160000
index 00000000..a82f0077
--- /dev/null
+++ b/modules/autoenv/external
@@ -0,0 +1 @@
+Subproject commit a82f007782cd9794bfc6f1f49792fd8f644f7870
diff --git a/modules/autoenv/init.zsh b/modules/autoenv/init.zsh
new file mode 100644
index 00000000..db450a16
--- /dev/null
+++ b/modules/autoenv/init.zsh
@@ -0,0 +1,5 @@
+#
+# Load autoenv Module
+#
+source "${0:h}/external/autoenv.plugin.zsh"
+