diff --git a/README.md b/README.md
index 68824df1..436d9c0c 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ name. That seems to be the fairest way to arrange this table.
 | Perl | [perl -c](https://perl.org/), [perl-critic](https://metacpan.org/pod/Perl::Critic) |
 | PHP | [php -l](https://secure.php.net/), [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) |
 | Pug | [pug-lint](https://github.com/pugjs/pug-lint) |
+| Puppet | [puppet](https://puppet.com), [puppet-lint](https://puppet-lint.com) |
 | Python | [flake8](http://flake8.pycqa.org/en/latest/), [pylint](https://www.pylint.org/) |
 | Ruby | [rubocop](https://github.com/bbatsov/rubocop) |
 | SASS | [sass-lint](https://www.npmjs.com/package/sass-lint) |
diff --git a/ale_linters/puppet/puppet.vim b/ale_linters/puppet/puppet.vim
new file mode 100644
index 00000000..b00a7ddc
--- /dev/null
+++ b/ale_linters/puppet/puppet.vim
@@ -0,0 +1,38 @@
+" Author: Alexander Olofsson <alexander.olofsson@liu.se>
+
+function! ale_linters#puppet#puppet#Handle(buffer, lines)
+    " Matches patterns like the following:
+    " Error: Could not parse for environment production: Syntax error at ':' at /root/puppetcode/modules/nginx/manifests/init.pp:43:12
+
+    let l:pattern = '^Error: .*: \(.\+\) at .\+:\(\d\+\):\(\d\+\)$'
+    let l:output = []
+
+    for l:line in a:lines
+        let l:match = matchlist(l:line, l:pattern)
+
+        if len(l:match) == 0
+            continue
+        endif
+
+        " vcol is needed to indicate that the column is a character
+        call add(l:output, {
+        \   'bufnr': a:buffer,
+        \   'lnum': l:match[2] + 0,
+        \   'vcol': 0,
+        \   'col': l:match[3] + 0,
+        \   'text': l:match[1],
+        \   'type': 'E',
+        \   'nr': -1,
+        \})
+    endfor
+
+    return l:output
+endfunction
+
+call ale#linter#Define('puppet', {
+\   'name': 'puppet',
+\   'executable': 'puppet',
+\   'output_stream': 'stderr',
+\   'command': g:ale#util#stdin_wrapper . ' .pp puppet parser validate --color=false',
+\   'callback': 'ale_linters#puppet#puppet#Handle',
+\})
diff --git a/ale_linters/puppet/puppetlint.vim b/ale_linters/puppet/puppetlint.vim
new file mode 100644
index 00000000..2d93e530
--- /dev/null
+++ b/ale_linters/puppet/puppetlint.vim
@@ -0,0 +1,8 @@
+" Author: Alexander Olofsson <alexander.olofsson@liu.se>
+
+call ale#linter#Define('puppet', {
+\   'name': 'puppetlint',
+\   'executable': 'puppet-lint',
+\   'command': g:ale#util#stdin_wrapper . ' .pp puppet-lint --no-autoloader_layout-check --log-format "-:%{line}:%{column}: %{kind}: [%{check}] %{message}"',
+\   'callback': 'ale#handlers#HandleGCCFormat',
+\})
diff --git a/doc/ale.txt b/doc/ale.txt
index 6e38c73d..42b746c5 100644
--- a/doc/ale.txt
+++ b/doc/ale.txt
@@ -81,6 +81,7 @@ The following languages and tools are supported.
 * Perl: 'perl' (-c flag), 'perlcritic'
 * PHP: 'php' (-l flag), 'phpcs'
 * Pug: 'pug-lint'
+* Puppet: 'puppet', 'puppet-lint'
 * Python: 'flake8', 'pylint'
 * Ruby: 'rubocop'
 * SASS: 'sasslint'