diff --git a/.gitignore b/.gitignore
index ae91f6e..2098b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-8.34.0.tar.gz
 /rsyslog-8.35.0.tar.gz
 /rsyslog-doc-8.35.0.tar.gz
+/rsyslog-8.36.0.tar.gz
+/rsyslog-doc-8.36.0.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index 4eb9f6b..9e394f6 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -1,13 +1,6 @@
 %define rsyslog_statedir %{_sharedstatedir}/rsyslog
 %define rsyslog_pkidir %{_sysconfdir}/pki/rsyslog
 %define rsyslog_docdir %{_docdir}/rsyslog
-%if 0%{?rhel} >= 7
-%global want_hiredis 0
-%global want_mongodb 0
-%else
-%global want_hiredis 1
-%global want_mongodb 1
-%endif
 #due to multiple failures of extensive testbench on various archs
 #and module requirements of certain tests need to have it disabled,
 #tests execution possible locally on properly set up workstation
@@ -15,8 +8,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.35.0
-Release: 4%{?dist}
+Version: 8.36.0
+Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -34,7 +27,6 @@ BuildRequires: flex
 BuildRequires: libgcrypt-devel
 BuildRequires: libfastjson-devel >= 0.99.8
 BuildRequires: libestr-devel >= 0.1.9
-BuildRequires: liblogging-stdlog-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: pkgconfig
@@ -72,13 +64,11 @@ Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: libcurl-devel
 
-%if %{want_hiredis}
 %package hiredis
 Summary: Redis support for rsyslog
 Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: hiredis-devel
-%endif
 
 %package mmjsonparse
 Summary: JSON enhanced logging support
@@ -113,13 +103,11 @@ Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: mariadb-connector-c-devel
 
-%if %{want_mongodb}
 %package mongodb
 Summary: MongoDB support for rsyslog
 Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: mongo-c-driver-devel snappy-devel cyrus-sasl-devel
-%endif
 
 %package pgsql
 Summary: PostgresSQL support for rsyslog
@@ -200,10 +188,8 @@ This subpackage contains documentation for rsyslog.
 This module provides the capability for rsyslog to feed logs directly into
 Elasticsearch.
 
-%if %{want_hiredis}
 %description hiredis
 This module provides output to Redis.
-%endif
 
 %description mmjsonparse
 This module provides the capability to recognize and parse JSON enhanced
@@ -229,11 +215,9 @@ many systems. Drivers are available via the libdbi-drivers project.
 The rsyslog-mysql package contains a dynamic shared object that will add
 MySQL database support to rsyslog.
 
-%if %{want_mongodb}
 %description mongodb
 The rsyslog-mongodb package contains a dynamic shared object that will add
 MongoDB database support to rsyslog.
-%endif
 
 %description pgsql
 The rsyslog-pgsql package contains a dynamic shared object that will add
@@ -291,18 +275,15 @@ autoreconf -iv
 %build
 %ifarch sparc64
 #sparc64 need big PIE
-export CFLAGS="$RPM_OPT_FLAGS -fPIE -DPATH_PIDFILE=\\\"/var/run/syslogd.pid\\\""
-export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+export CFLAGS="$RPM_OPT_FLAGS -fPIE"
 %else
-export CFLAGS="$RPM_OPT_FLAGS -fpie -DPATH_PIDFILE=\\\"/var/run/syslogd.pid\\\""
-export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+export CFLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 
-%if %{want_hiredis}
 # the hiredis-devel package doesn't provide a pkg-config file
 export HIREDIS_CFLAGS=-I/usr/include/hiredis
 export HIREDIS_LIBS="-L%{_libdir} -lhiredis"
-%endif
 %configure \
 	--prefix=/usr \
 	--disable-static \
@@ -329,13 +310,9 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis"
 	--enable-mmsnmptrapd \
 	--enable-mysql \
 	--enable-omamqp1 \
-%if %{want_hiredis}
 	--enable-omhiredis \
-%endif
 	--enable-omjournal \
-%if %{want_mongodb}
 	--enable-ommongodb \
-%endif
 	--enable-omprog \
 	--enable-omrabbitmq \
 	--enable-omstdout \
@@ -462,10 +439,8 @@ done
 %files elasticsearch
 %{_libdir}/rsyslog/omelasticsearch.so
 
-%if %{want_hiredis}
 %files hiredis
 %{_libdir}/rsyslog/omhiredis.so
-%endif
 
 %files libdbi
 %{_libdir}/rsyslog/omlibdbi.so
@@ -486,11 +461,9 @@ done
 %doc %{rsyslog_docdir}/mysql-createDB.sql
 %{_libdir}/rsyslog/ommysql.so
 
-%if %{want_mongodb}
 %files mongodb
 %{_bindir}/logctl
 %{_libdir}/rsyslog/ommongodb.so
-%endif
 
 %files pgsql
 %doc %{rsyslog_docdir}/pgsql-createDB.sql
@@ -527,6 +500,12 @@ done
 %{_libdir}/rsyslog/mmkubernetes.so
 
 %changelog
+* Mon Jul 02 2018 Jiri Vymazal <jvymazal@redhat.com> - 8.36.0-1
+- rebase to 8.36.0
+  - removed stdlog dependency as upstream is going to drop it
+- following upstream naming of pidfile
+- removed needless conditionals
+
 * Fri Jun  8 2018 Remi Collet <remi@remirepo.net> - 8.35.0-4
 - rebuild with libbson and libmongc 1.10.2 (soname back to 0)
 
diff --git a/sources b/sources
index a3ec2f7..eb9483f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.35.0.tar.gz) = 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
-SHA512 (rsyslog-doc-8.35.0.tar.gz) = f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+SHA512 (rsyslog-8.36.0.tar.gz) = b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
+SHA512 (rsyslog-doc-8.36.0.tar.gz) = a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa