diff --git a/emacs/.emacs.d/config/init-direnv.el b/emacs/.emacs.d/config/init-direnv.el
new file mode 100644
index 0000000..c5cd70a
--- /dev/null
+++ b/emacs/.emacs.d/config/init-direnv.el
@@ -0,0 +1,13 @@
+;; Smooth integration with direnv
+(use-package direnv
+  :if (executable-find "direnv")
+  :defer 2
+  :config
+  (direnv-mode)
+  (add-hook 'eshell-mode-hook #'direnv-update-directory-environment)
+  (add-hook 'eshell-directory-change-hook
+	    (lambda ()
+	      (unless (file-remote-p default-directory)
+		(direnv-update-directory-environment)))))
+
+(provide 'init-direnv)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 92c4145..734a797 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -78,6 +78,7 @@
 (require 'init-run-command)
 (require 'init-aws)
 (require 'init-prodigy)
+(require 'init-direnv)
 
 ;; Load the custom file
 (when (file-exists-p custom-file)