diff --git a/.gitignore b/.gitignore
index f273991..bcffa83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.38.0.tar.gz
 /rsyslog-8.39.0.tar.gz
 /rsyslog-doc-8.39.0.tar.gz
+/rsyslog-8.1904.0.tar.gz
+/rsyslog-doc-8.1904.0.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index a24774e..a2b06c9 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -8,8 +8,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.39.0
-Release: 3%{?dist}
+Version: 8.1904.0
+Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 URL: http://www.rsyslog.com/
 Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -479,6 +479,10 @@ done
 %doc %{rsyslog_docdir}/k8s_container_name.rulebase
 
 %changelog
+* Mon May 13 2019 Jiri Vymazal <jvymazal@redhat.com> - 8.1904.0-1
+- rebase to upstream version 8.1904.0
+  resolves: rhbz#1668473
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.39.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 9677cf9..d5489c2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.39.0.tar.gz) = f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
-SHA512 (rsyslog-doc-8.39.0.tar.gz) = a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
+SHA512 (rsyslog-8.1904.0.tar.gz) = cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
+SHA512 (rsyslog-doc-8.1904.0.tar.gz) = da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828