diff --git a/.gitignore b/.gitignore
index 98ca3a5..5deda40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng-3.8.1.tar.gz
 /syslog-ng-3.9.1.tar.gz
 /syslog-ng-3.10.1.tar.gz
+/syslog-ng-3.11.1.tar.gz
diff --git a/sources b/sources
index 7ef669a..66c397a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (syslog-ng-3.10.1.tar.gz) = 9fc1f188d3d7917aba21453a27a5b08aa04fd32ba39562088dd7e0bc57d268b5e27f56b4539d9f7d2b83623ba52e785ede970b19e7f7619c084766fc806869f8
+SHA512 (syslog-ng-3.11.1.tar.gz) = 780fa81daaf4cf327e2b8203e89dca6a8dcf51bf01a16eab672c536eae9e28bac6d5e19c46630806b6c7ea6f3fdcfb625e733be092a360897b234f46f9ae8c51
diff --git a/syslog-ng-3.7.0beta2-syslog-ng.service.patch b/syslog-ng-3.7.0beta2-syslog-ng.service.patch
deleted file mode 100644
index c6db3c5..0000000
--- a/syslog-ng-3.7.0beta2-syslog-ng.service.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- syslog-ng-3.7.0beta2/contrib/systemd/syslog-ng.service.old	2015-08-07 13:18:52.650666865 +0200
-+++ syslog-ng-3.7.0beta2/contrib/systemd/syslog-ng.service	2015-08-07 13:20:20.762689543 +0200
-@@ -4,7 +4,7 @@
- 
- [Service]
- Type=notify
--ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS
-+ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS -p /var/run/syslogd.pid
- ExecReload=/bin/kill -HUP $MAINPID
- EnvironmentFile=-/etc/default/syslog-ng
- EnvironmentFile=-/etc/sysconfig/syslog-ng
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 163aa07..c1ca19c 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version:3.10
+@version:3.11
 @include "scl.conf"
 
 # syslog-ng configuration file.
diff --git a/syslog-ng.service b/syslog-ng.service
new file mode 100644
index 0000000..a5bff70
--- /dev/null
+++ b/syslog-ng.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=System Logger Daemon
+Documentation=man:syslog-ng(8)
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/syslog-ng -F $SYSLOGNG_OPTS -p /var/run/syslogd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+EnvironmentFile=-/etc/default/syslog-ng
+EnvironmentFile=-/etc/sysconfig/syslog-ng
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/syslog-ng.spec b/syslog-ng.spec
index c3714b5..9cf8d97 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,9 +1,8 @@
-%global evtlog_ver 0.2.13
 %global ivykis_ver 0.36.1
 
 Name: syslog-ng
-Version: 3.10.1
-Release: 3%{?dist}
+Version: 3.11.1
+Release: 1%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -12,8 +11,7 @@ URL:	https://syslog-ng.org/
 Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
-
-Patch0: syslog-ng-3.7.0beta2-syslog-ng.service.patch
+Source3: syslog-ng.service
 
 BuildRequires: perl-generators
 BuildRequires: systemd-units
@@ -21,15 +19,14 @@ BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: bison, flex
 BuildRequires: libxslt
-BuildRequires: eventlog-devel >= %{evtlog_ver}
-BuildRequires: glib2-devel >= 2.10.1
+BuildRequires: glib2-devel
 BuildRequires: ivykis-devel >= %{ivykis_ver}
 BuildRequires: json-c-devel
 BuildRequires: libcap-devel
 BuildRequires: libdbi-devel
 BuildRequires: libnet-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel >= 6.1
+BuildRequires: pcre-devel
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libuuid-devel
 BuildRequires: libesmtp-devel
@@ -39,9 +36,10 @@ BuildRequires: GeoIP-devel
 BuildRequires: systemd-devel
 BuildRequires: hiredis-devel
 BuildRequires: riemann-c-client-devel
-# BuildRequires: python-devel
 BuildRequires: java-devel
 BuildRequires: libcurl-devel
+BuildRequires: snappy-devel
+BuildRequires: libmaxminddb-devel
 
 # Test suite
 BuildRequires: python
@@ -156,14 +154,6 @@ Obsoletes: %{name}-curl < 3.10
 %description http
 This module supports the http destination.
 
-#%package python
-#Summary:        Python destination support for syslog-ng
-#Group:          System/Libraries
-#Requires:       %{name} = %{version}
-#
-#%description python
-#This package provides python destination support for syslog-ng.
-
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -176,7 +166,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -225,8 +214,8 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
 
 
 # remove rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{_smp_mflags}
 
@@ -240,6 +229,9 @@ make DESTDIR=%{buildroot} install
 %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
 %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
 
+%{__install} -d -m 755 %{buildroot}%{_prefix}/lib/systemd/system
+%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
+
 # create the local state dir
 %{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name}
 
@@ -264,6 +256,8 @@ find %{buildroot} -name "*.la" -exec rm -f {} \;
 rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc
 rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
 
+rm %{buildroot}%{_unitdir}/%{name}@.service
+
 # %check
 # LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} VERBOSE=1 make check
 
@@ -320,12 +314,14 @@ fi
 
 %dir %{_sharedstatedir}/%{name}
 %{_sbindir}/%{name}
+%{_sbindir}/%{name}-debun
 %{_sbindir}/syslog-ng-ctl
 %{_bindir}/loggen
 %{_bindir}/pdbtool
 %{_bindir}/dqtool
 %{_bindir}/update-patterndb
 %{_libdir}/lib%{name}-*.so.*
+%{_libdir}/libevtlog-*.so.*
 %{_libdir}/%{name}/*.so
 %exclude %{_libdir}/%{name}/libafsql.so
 %exclude %{_libdir}/%{name}/libafmongodb.so
@@ -333,8 +329,8 @@ fi
 %exclude %{_libdir}/%{name}/libafsmtp.so
 %exclude %{_libdir}/%{name}/libriemann.so
 %exclude %{_libdir}/%{name}/libgeoip-plugin.so
+%exclude %{_libdir}/%{name}/libgeoip2-plugin.so
 %exclude %{_libdir}/%{name}/libhttp.so
-# %exclude %{_libdir}/%{name}/libmod-python.so
 %exclude %{_libdir}/%{name}/libmod-java.so
 
 %dir %{_datadir}/%{name}
@@ -350,6 +346,8 @@ fi
 %{_mandir}/man1/loggen.1*
 %{_mandir}/man1/pdbtool.1*
 %{_mandir}/man1/syslog-ng-ctl.1*
+%{_mandir}/man1/syslog-ng-debun.1*
+%{_mandir}/man1/dqtool.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
 
@@ -372,6 +370,7 @@ fi
 
 %files geoip
 %{_libdir}/%{name}/libgeoip-plugin.so
+%{_libdir}/%{name}/libgeoip2-plugin.so
 
 %files riemann
 %{_libdir}/%{name}/libriemann.so
@@ -379,17 +378,10 @@ fi
 %files http
 %{_libdir}/%{name}/libhttp.so
 
-#%files python
-#%{_libdir}/python2.7/site-packages/syslogng-1.0-py2.7.egg-info
-#%dir %{_libdir}/python2.7/site-packages/syslogng/
-#%dir %{_libdir}/python2.7/site-packages/syslogng/debuggercli/
-#%{_libdir}/python2.7/site-packages/syslogng/*
-#%{_libdir}/python2.7/site-packages/syslogng/debuggercli/*
-#%{_libdir}/%{name}/libmod-python.so
-
 %files devel
 %{_libdir}/libsyslog-ng.so
 %{_libdir}/libsyslog-ng-native-connector.a
+%{_libdir}/libevtlog.so
 %{_includedir}/%{name}/
 %{_libdir}/pkgconfig/syslog-ng.pc
 %{_libdir}/pkgconfig/syslog-ng-native-connector.pc
@@ -398,6 +390,9 @@ fi
 
 
 %changelog
+* Mon Sep 04 2017 My Karlsson <mk@acc.umu.se> - 3.11.1-1
+- Update to upstream release 3.11.1
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild