diff --git a/.gitmessage b/.gitmessage
new file mode 100644
index 0000000000..0f257701d4
--- /dev/null
+++ b/.gitmessage
@@ -0,0 +1,39 @@
+
+# [<tag>] <subject> (Max 70 char)
+# |<----   Preferably using up to 60 chars   --->|<------------------->|
+# Example: [feature] Implement automated commit messages
+
+# (Optional) Explain why this change is being made
+# |<----   Try To Limit Each Line to a Maximum Of 70-75 Characters   ---->|
+
+# --- COMMIT END ---
+# Tag can be
+#    analyzer      (Analyzer related changes)
+#    clang         (Clang Static Analyzer related changes)
+#    clang-tidy    (Clang Tidy related changes)
+#    cmd           (Command line changes)
+#    cfg           (Config file changes)
+#    db            (Issues related to the database schema)
+#    doc           (Changes to documentation)
+#    gui           (Changes in the web GUI)
+#    fix           (Bug fix)
+#    feat          (New feature)
+#    plist2html    (Changes in the plist-to-html tool)
+#    refactor      (Refactoring code)
+#    server        (Server related changes)
+#    style         (Formatting, missing semi colons, etc; no code change)
+#    test          (Adding or refactoring tests; no production code change)
+#    tu-collector  (Changes in the tu-collector tool)
+#    version       (Version bump/new release; no production code change)
+#    web           (Changes in the web module)
+#
+# Note: Multiple tags can be combined, e.g. [feat][server] Save and load filters in the GUI
+# --------------------
+# Remember to:
+#   * Capitalize the subject line.
+#   * Use the imperative mood in the subject line.
+#   * Do not end the subject line with a period.
+#   * Separate subject from body with a blank line.
+#   * Use the body to explain what and why vs how.
+#   * Can use multiple lines with "-" or "*" for bullet points in body.
+# --------------------
diff --git a/Makefile b/Makefile
index 833db2de76..ff71672369 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ package_tu_collector: build_tu_collector package_dir_structure
 	cd $(CC_BUILD_DIR) && \
 	ln -sf ../lib/python2.7/tu_collector/tu_collector.py bin/tu_collector
 
-package: package_dir_structure package_plist_to_html package_tu_collector
+package: package_dir_structure set_git_commit_template package_plist_to_html package_tu_collector
 	BUILD_DIR=$(BUILD_DIR) BUILD_LOGGER_64_BIT_ONLY=$(BUILD_LOGGER_64_BIT_ONLY) $(MAKE) -C $(CC_ANALYZER) package_analyzer
 	BUILD_DIR=$(BUILD_DIR) $(MAKE) -C $(CC_WEB) package_web
 
@@ -229,3 +229,6 @@ test_functional:
 test_functional_in_env:
 	BUILD_DIR=$(BUILD_DIR) $(MAKE) -C $(CC_ANALYZER) test_functional_in_env
 	BUILD_DIR=$(BUILD_DIR) $(MAKE) -C $(CC_WEB) test_functional_in_env
+
+set_git_commit_template:
+	if [ -d "$(CURRENT_DIR)/.git" ]; then git config --local commit.template .gitmessage; fi