diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b0374fd..41ce6fb 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -110,3 +110,15 @@
 ;; rust-mode
 (if (file-exists-p "~/.emacs.d/rust-mode.el")
     (load-file "~/.emacs.d/rust-mode.el"))
+
+;; puppet-mode
+(if (file-exists-p "~/.emacs.d/puppet-syntax-emacs/puppet-mode-init.el")
+    (load-file "~/.emacs.d/puppet-syntax-emacs/puppet-mode-init.el"))
+(if (file-exists-p "~/.emacs.d/puppet-syntax-emacs/puppet-mode.el")
+    (load-file "~/.emacs.d/puppet-syntax-emacs/puppet-mode.el"))
+
+;; puppet flymake via puppet-lint
+(if (file-exists-p "~/.emacs.d/puppet-flymake/flymake-puppet.el")
+    (load-file "~/.emacs.d/puppet-flymake/flymake-puppet.el"))
+(require 'flymake-puppet)
+(add-hook 'puppet-mode-hook (lambda () (flymake-puppet-load)))