diff --git a/init.el b/init.el
index a1f0d83..895343b 100644
--- a/init.el
+++ b/init.el
@@ -117,6 +117,7 @@
 ;; dockerfile
 (use-package dockerfile-mode :ensure t
   :config (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)))
+;; puppet
 (use-package puppet-mode :ensure t
   :config
   (add-to-list 'auto-mode-alist '("\\.pp\\'" . puppet-mode))
@@ -153,10 +154,22 @@
   (go-mode . lsp-deferred)
   (javascript-mode . lsp-deferred)
   (js-mode . lsp-deferred)
+  (puppet-mode . lsp-deferred)
   (python-mode . lsp-deferred)
   (ruby-mode . lsp-deferred)
   (rust-mode . lsp-deferred)
   :config
+  (lsp-register-client
+   (make-lsp-client
+    :new-connection
+    (lsp-stdio-connection '("bundle"
+			    "exec"
+			    "/home/stefan/Apps/puppet-editor-services/puppet-languageserver"
+			    "--debug=/tmp/puplsp"
+			    "--stdio"))
+    :major-modes '(puppet-mode)
+    :server-id 'puppet-languageserver))
+  (add-to-list 'lsp-language-id-configuration '(puppet-mode . "puppet-languageserver"))
   (setq lsp-auto-configure t
 	lsp-prefer-flymake nil
 	lsp-auto-guess-root nil)