diff --git a/conf/master b/conf/master
index 3aa9742651..5a21621b27 100644
--- a/conf/master
+++ b/conf/master
@@ -564,6 +564,22 @@
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
 
+# The Jinja renderer can accept Line Statements and/or Line Comments if
+# configured with a prefix for each.
+# See http://jinja.pocoo.org/docs/templates/#line-statements
+#
+# If this is set to a valid string, any line starting with this prefix
+# will be interpreted as a line statement by the jinja renderer.
+# This is set to "#" in the Jinja documentation's examples.
+# Defaults to None.
+#jinja_line_statement_prefix: None
+#
+# If this is set to a valid string, any line starting with this prefix
+# will be interpreted as a line comment statement by the jinja renderer.
+# This is set to "##" in the Jinja documentation's examples.
+# Defaults to None.
+#jinja_line_comment_prefix: None
+
 # The Jinja renderer can strip extra carriage returns and whitespace
 # See http://jinja.pocoo.org/docs/api/#high-level-api
 #
diff --git a/conf/suse/master b/conf/suse/master
index aeaa1d8859..9e77dfe2e9 100644
--- a/conf/suse/master
+++ b/conf/suse/master
@@ -537,6 +537,22 @@ syndic_user: salt
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
 
+# The Jinja renderer can accept Line Statements and/or Line Comments if
+# configured with a prefix for each.
+# See http://jinja.pocoo.org/docs/templates/#line-statements
+#
+# If this is set to a valid string, any line starting with this prefix
+# will be interpreted as a line statement by the jinja renderer.
+# This is set to "#" in the Jinja documentation's examples.
+# Defaults to None.
+#jinja_line_statement_prefix: None
+#
+# If this is set to a valid string, any line starting with this prefix
+# will be interpreted as a line comment statement by the jinja renderer.
+# This is set to "##" in the Jinja documentation's examples.
+# Defaults to None.
+#jinja_line_comment_prefix: None
+
 # The Jinja renderer can strip extra carriage returns and whitespace
 # See http://jinja.pocoo.org/docs/api/#high-level-api
 #
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
index 03b54ac42b..1009d92aab 100644
--- a/doc/ref/configuration/master.rst
+++ b/doc/ref/configuration/master.rst
@@ -1924,6 +1924,42 @@ the cloud profile or master config file, no templating will be performed.
 
     userdata_template: jinja
 
+.. conf_master:: jinja_line_statement_prefix
+
+``jinja_line_statement_prefix``
+---------------------
+
+.. versionadded:: Oxygen
+
+Default: ``None``
+
+If this is set to a valid string, any line starting with this prefix
+will be interpreted as a line statement by the jinja renderer.
+Defaults to ``None`` and corresponds
+to the Jinja environment init variable ``line_statement_prefix``.
+
+.. code-block:: yaml
+
+    jinja_line_statement_prefix: None
+
+.. conf_master:: jinja_line_comment_prefix
+
+``jinja_line_comment_prefix``
+---------------------
+
+.. versionadded:: Oxygen
+
+Default: ``None``
+
+If this is set to a valid string, any line starting with this prefix
+will be interpreted as a line comment by the jinja renderer.
+Defaults to ``None`` and corresponds
+to the Jinja environment init variable ``line_comment_prefix``.
+
+.. code-block:: yaml
+
+    jinja_line_comment_prefix: None
+
 .. conf_master:: jinja_trim_blocks
 
 ``jinja_trim_blocks``