diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
new file mode 100644
index 0000000000..1132ab2dd1
--- /dev/null
+++ b/inventory/group_vars/buildarm
@@ -0,0 +1 @@
+host_group: kojibuilder
diff --git a/roles/base/files/rsyslog/rsyslog.conf.kojibuilder b/roles/base/files/rsyslog/rsyslog.conf.kojibuilder
index 2c2852ddd1..9719770987 100644
--- a/roles/base/files/rsyslog/rsyslog.conf.kojibuilder
+++ b/roles/base/files/rsyslog/rsyslog.conf.kojibuilder
@@ -5,8 +5,9 @@
 
 #### MODULES ####
 
-$ModLoad imuxsock.so	# provides support for local system logging (e.g. via logger command)
-$ModLoad imklog.so	# provides kernel logging support (previously done by rklogd)
+$ModLoad imuxsock       # provides support for local system logging (e.g. via logger command)
+$ModLoad imjournal      # provides access to the systemd journal
+$ModLoad imklog   	# provides kernel logging support (previously done by rklogd)
 #$ModLoad immark.so	# provides --MARK-- message capability
 
 # Provides UDP syslog reception
@@ -20,9 +21,19 @@ $ModLoad imklog.so	# provides kernel logging support (previously done by rklogd)
 
 #### GLOBAL DIRECTIVES ####
 
+# Include all config files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
+
 # Use default timestamp format
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 
+# Turn off message reception via local log socket;
+# local messages are retrieved through imjournal now.
+$OmitLocalLogging on
+
+# File to store the position in the journal
+$StateFile imjournal.state
+
 #### RULES ####
 
 # Log all kernel messages to the console.