diff --git a/CHANGELOG b/CHANGELOG
index 5ba4cf7..1e78b81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
-YYYY-MM-DD Release 0.1.0
-- something you did
-- something else you did
+#YYYY-MM-DD Release 0.1.0
+#- something you did
+#- something else you did
+
+2016-04-06 Release 1.0.5 Michal Taratuta
+- add custom tag field for rsyslog and syslog-ng templates
diff --git a/manifests/rsyslog.pp b/manifests/rsyslog.pp
index e98841c..be9435d 100644
--- a/manifests/rsyslog.pp
+++ b/manifests/rsyslog.pp
@@ -24,6 +24,9 @@
 # [*enable_tls*]
 #   Enables or disables TLS encryption for shipped events.
 #
+#[*custom_tag*]
+#   Custom tag so you can filter Loggly for it i.e. test, sandbox etc...
+#
 # === Examples
 #
 #  class { 'loggly::rsyslog':
@@ -38,6 +41,7 @@
   $customer_token,
   $cert_path       = $loggly::_cert_path,
   $enable_tls      = $loggly::enable_tls,
+  $custom_tag      = undef,
 ) inherits loggly {
 
   validate_string($customer_token)
diff --git a/manifests/syslog_ng.pp b/manifests/syslog_ng.pp
index 8c7db47..e96bfbd 100644
--- a/manifests/syslog_ng.pp
+++ b/manifests/syslog_ng.pp
@@ -30,6 +30,9 @@
 #   Enabled on all distros except CentOS and Red Hat Enterprise Linux as the
 #   packages for those distros are not compiled with TLS support by default.
 #
+# [*custom_tag*]
+#   Custom tag so you can filter Loggly for it i.e. test, sandbox etc...
+#
 # === Examples
 #
 #  class { 'loggly::syslog_ng':
@@ -44,6 +47,7 @@
   $customer_token,
   $enable_tls     = $loggly::enable_tls,
   $cert_path      = $loggly::_cert_path,
+  $custom_tag      = undef,
 ) inherits loggly {
 
   validate_string($customer_token)
diff --git a/templates/rsyslog/22-loggly.conf.erb b/templates/rsyslog/22-loggly.conf.erb
index c5bc03b..0219acd 100644
--- a/templates/rsyslog/22-loggly.conf.erb
+++ b/templates/rsyslog/22-loggly.conf.erb
@@ -4,7 +4,7 @@
 ### TLS RsyslogTemplate for Loggly
 ##########################################################
 
-$template LogglyFormat,"<%%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [<%= @customer_token -%>@41058 tag=\"Rsyslog TLS\"] %msg%"
+$template LogglyFormat,"<%%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [<%= @customer_token -%>@41058 <% if @custom_tag -%>tag=\"<%= @custom_tag %>\" <% end -%>] %msg%"
 
 #RsyslogGnuTLS
 
@@ -22,7 +22,7 @@ $ActionSendStreamDriverPermittedPeer *.loggly.com
 ### TLS RsyslogTemplate for Loggly
 ##########################################################
 
-$template LogglyFormat,"<%%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [<%= @customer_token -%>@41058] %msg%\n"
+$template LogglyFormat,"<%%pri%>%protocol-version% %timestamp:::date-rfc3339% %HOSTNAME% %app-name% %procid% %msgid% [<%= @customer_token -%>@41058 <% if @custom_tag -%>tag=\"<%= @custom_tag %>\" <% end -%>] %msg%\n"
 
 *.* @@logs-01.loggly.com:514; LogglyFormat
 <% end -%>
diff --git a/templates/syslog-ng/22-loggly.conf.erb b/templates/syslog-ng/22-loggly.conf.erb
index 6b2dadf..7e0ff0e 100644
--- a/templates/syslog-ng/22-loggly.conf.erb
+++ b/templates/syslog-ng/22-loggly.conf.erb
@@ -4,7 +4,7 @@
 
 
 template LogglyFormat {
-    template("<${PRI}>1 ${ISODATE} ${HOST} ${PROGRAM} ${PID} ${MSGID} [<%= @customer_token -%>@41058] $MSG\n");
+    template("<${PRI}>1 ${ISODATE} ${HOST} ${PROGRAM} ${PID} ${MSGID} [<%= @customer_token -%>@41058 <% if @custom_tag -%>tag=\"<%= @custom_tag %>\" <% end -%>] $MSG\n");
 };
 
 destination d_loggly {