develop
diff --git a/heka/files/decoder/rsyslog.toml b/heka/files/decoder/rsyslog.toml
new file mode 100644
index 0000000..bb4ec51
--- /dev/null
+++ b/heka/files/decoder/rsyslog.toml
@@ -0,0 +1,9 @@
+[RsyslogDecoder]
+type = "SandboxDecoder"
+filename = "lua_decoders/rsyslog.lua"
+
+[RsyslogDecoder.config]
+type = "RSYSLOG_TraditionalFileFormat"
+template = '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n'
+tz = "Europe/Prague"
+
diff --git a/heka/files/encoder/RstEncoder.toml b/heka/files/encoder/RstEncoder.toml
new file mode 100644
index 0000000..b91b62d
--- /dev/null
+++ b/heka/files/encoder/RstEncoder.toml
@@ -0,0 +1,3 @@
+[<%= @title %>_encoder]
+type = "RstEncoder"
+
diff --git a/heka/files/output/95-output-amqp.toml b/heka/files/output/amqp.toml
similarity index 100%
rename from heka/files/output/95-output-amqp.toml
rename to heka/files/output/amqp.toml
diff --git a/heka/files/output/logoutput.toml b/heka/files/output/logoutput.toml
new file mode 100644
index 0000000..dbca2e9
--- /dev/null
+++ b/heka/files/output/logoutput.toml
@@ -0,0 +1,4 @@
+[LogOutput]
+encoder = "RstEncoder"
+message_matcher = "TRUE"
+