diff --git a/assets/syntaxes/02_Extra/DotENV.sublime-syntax b/assets/syntaxes/02_Extra/DotENV.sublime-syntax
index 708a5a82..9abbfa1e 100644
--- a/assets/syntaxes/02_Extra/DotENV.sublime-syntax
+++ b/assets/syntaxes/02_Extra/DotENV.sublime-syntax
@@ -8,6 +8,7 @@ file_extensions:
   - .env.local
   - .env.sample
   - .env.example
+  - .env.template
   - .env.test
   - .env.test.local
   - .env.testing
@@ -23,6 +24,10 @@ file_extensions:
   - .env.defaults
   - .envrc
   - .flaskenv
+  - env
+  - env.example
+  - env.sample
+  - env.template
 scope: source.env
 contexts:
   main:
diff --git a/doc/assets.md b/doc/assets.md
index 56140e2f..c5bc5ec0 100644
--- a/doc/assets.md
+++ b/doc/assets.md
@@ -79,6 +79,7 @@ The following files have been manually modified after converting from a `.tmLang
 
 * `Apache.sublime_syntax`=> removed `conf` and `CONF` file types.
 * `Dart.sublime-syntax` => removed `#regex.dart` include.
+* `DotENV.sublime-syntax` => added `.env.template`, `env` and `env.*` file types ([upstream PR](https://github.com/zaynali53/DotENV/pull/17)).
 * `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types and support for comments after section headers.
 * `Org mode.sublime-syntax` => removed `task` file type.
 * `Robot.sublime_syntax` => changed name to "Robot Framework", added `.resource` extension.