diff --git a/knot-resolver.spec b/knot-resolver.spec
index 70595d3..53e274e 100644
--- a/knot-resolver.spec
+++ b/knot-resolver.spec
@@ -1,7 +1,8 @@
 %global _hardened_build 1
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
 
 %define GPG_CHECK 1
-%define VERSION 3.0.0
+%define VERSION 3.1.0
 %define repodir %{_builddir}/%{name}-%{version}
 
 Name:           knot-resolver
@@ -37,35 +38,45 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libedit)
-BuildRequires:  pkgconfig(libknot) >= 2.7.1
-BuildRequires:  pkgconfig(libzscanner) >= 2.4.2
-BuildRequires:  pkgconfig(libdnssec) >= 2.3.1
+BuildRequires:  pkgconfig(libknot) >= 2.7.2
+BuildRequires:  pkgconfig(libzscanner) >= 2.7.2
+BuildRequires:  pkgconfig(libdnssec) >= 2.7.2
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libuv)
 BuildRequires:  pkgconfig(luajit) >= 2.0
 BuildRequires:  pkgconfig(systemd)
 
+# Distro-dependent dependencies
 %if 0%{?rhel}
 BuildRequires:  lmdb-devel
 # Lua 5.1 version of the libraries have different package names
 Requires:       lua-socket
 Requires:       lua-sec
-%else
+Requires(pre):	shadow-utils
+%endif
+%if 0%{?fedora}
 BuildRequires:  pkgconfig(lmdb)
+BuildRequires:  python3-sphinx
 Requires:       lua-socket-compat
 Requires:       lua-sec-compat
+Requires(pre):	shadow-utils
+%endif
+%if 0%{?suse_version}
+BuildRequires:  lmdb-devel
+BuildRequires:  python3-Sphinx
+Requires:       lua51-luasocket
+Requires:       lua51-luasec
+Requires(pre):	shadow
 %endif
 
-%if 0%{?fedora}
+%if "x%{?rhel}" == "x"
 # dependencies for doc package; disable in EPEL (missing fonts)
 # https://bugzilla.redhat.com/show_bug.cgi?id=1492884
 BuildRequires:  doxygen
 BuildRequires:  python3-breathe
-BuildRequires:  python3-sphinx
 BuildRequires:  python3-sphinx_rtd_theme
 %endif
 
-Requires(pre):		shadow-utils
 Requires(post):		systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
@@ -87,7 +98,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description devel
 The package contains development headers for Knot Resolver.
 
-%if 0%{?fedora}
+%if "x%{?rhel}" == "x"
 %package doc
 Summary:        Documentation for Knot Resolver
 BuildArch:      noarch
@@ -110,10 +121,10 @@ rm -v scripts/bootstrap-depends.sh
 
 %build
 %global build_paths PREFIX=%{_prefix} BINDIR=%{_bindir} LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir} ETCDIR=%{_sysconfdir}/knot-resolver
-%global build_flags V=1 CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" %{build_paths} HAS_go=no
+%global build_flags V=1 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" %{build_paths} HAS_go=no
 %make_build %{build_flags}
 
-%if 0%{?fedora}
+%if "x%{?rhel}" == "x"
 # build documentation
 make doc
 %endif
@@ -149,7 +160,7 @@ install -m 0644 -p %{repodir}/distro/common/systemd/kresd.systemd.7 %{buildroot}
 mkdir -p %{buildroot}%{_unitdir}/kresd@.service.d
 install -m 0644 -p %{repodir}/distro/common/systemd/drop-in/systemd-compat.conf %{buildroot}%{_unitdir}/kresd@.service.d/override.conf
 %endif
-%if 0%{?fedora}
+%if "x%{?rhel}" == "x"
 install -m 0644 -p %{repodir}/distro/common/systemd/kresd.socket %{buildroot}%{_unitdir}/kresd.socket
 install -m 0644 -p %{repodir}/distro/common/systemd/kresd-control@.socket %{buildroot}%{_unitdir}/kresd-control@.socket
 install -m 0644 -p %{repodir}/distro/common/systemd/kresd-tls.socket %{buildroot}%{_unitdir}/kresd-tls.socket
@@ -221,7 +232,7 @@ fi
 %if 0%{?rhel}
 %{_unitdir}/kresd@.service.d/override.conf
 %endif
-%if 0%{?fedora}
+%if "x%{?rhel}" == "x"
 %{_unitdir}/kresd*.socket
 %endif
 %{_tmpfilesdir}/knot-resolver.conf
@@ -237,12 +248,32 @@ fi
 %{_libdir}/pkgconfig/libkres.pc
 %{_libdir}/libkres.so
 
-%if 0%{?fedora}
+%if "x%{?rhel}" == "x"
 %files doc
 %doc doc/html
 %endif
 
 %changelog
+* Fri Nov 02 2018 Tomas Krizek <tomas.krizek@nic.cz> - 3.1.0-1
+Knot Resolver 3.1.0 (2018-11-02)
+================================
+
+Incompatible changes
+--------------------
+- hints.use_nodata(true) by default; that's what most users want
+- libknot >= 2.7.2 is required
+
+Improvements
+------------
+- cache: handle out-of-space SIGBUS slightly better (#197)
+- daemon: improve TCP timeout handling (!686)
+
+Bugfixes
+--------
+- cache.clear('name'): fix some edge cases in API (#401)
+- fix error handling from TLS writes (!669)
+- avoid SERVFAILs due to certain kind of NS dependency cycles (#374)
+
 * Mon Aug 20 2018 Tomas Krizek <tomas.krizek@nic.cz> - 3.0.0-1
 Knot Resolver 3.0.0 (2018-08-20)
 ================================
diff --git a/sources b/sources
index 98c0324..136b416 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (knot-resolver-3.0.0.tar.xz) = 044b5269d69e1f9b502709910533f00b060a53524c1ad1d19b78ec6fd474edef5cddfcc6e3a4123d1ab67b3e21fcde5891b463cd67b78da2fa69226bf1d34fa1
-SHA512 (knot-resolver-3.0.0.tar.xz.asc) = 9370ed04c8b488954ae227d4aba085decf85d0cf18f7c5d6cc2832a6c9bb8fb8e43ec7229112eb2beb176287eda50cd3e0b91f0d5212dff6870fe326c0065e10
+SHA512 (knot-resolver-3.1.0.tar.xz) = 511e8a02197ba9f87e8daafa150a2e0cf2a6ba64a9224fb4c02f7321cf9b8102030a2a79206289301ca2cbebb2df52089a661d4b28212e107e559d4debb5a368
+SHA512 (knot-resolver-3.1.0.tar.xz.asc) = 40e9207b88a948d59d1f9e34751011cf2d614bc3c4343f6db4689cc0da778b64fa8f5738d8fcb4fddfa8a7c65af5c15d0b2c75395ad71d05b075b7e3c123b529