diff --git a/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch b/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
index 9fe165e7681d..0f63799c6b76 100644
--- a/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
+++ b/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
@@ -1,5 +1,3 @@
-diff --git a/samples/Makefile.am b/samples/Makefile.am
-index c253c91..107401d 100644
 --- a/samples/Makefile.am
 +++ b/samples/Makefile.am
 @@ -19,11 +19,6 @@ EXTRA_DIST = knot.sample.conf.in example.com.zone
@@ -14,13 +12,9 @@ index c253c91..107401d 100644
  uninstall-local:
  	-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \
  	        $(DESTDIR)/$(config_dir)/example.com.zone
-diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc
-index e6765d9..d859d23 100644
 --- a/src/utils/Makefile.inc
 +++ b/src/utils/Makefile.inc
-@@ -79,11 +79,6 @@ endif HAVE_DNSTAP
- endif HAVE_UTILS
- 
+@@ -137,7 +137,2 @@
  if HAVE_DAEMON
 -# Create storage and run-time directories
 -install-data-hook:
@@ -28,5 +22,3 @@ index e6765d9..d859d23 100644
 -	$(INSTALL) -d $(DESTDIR)/@run_dir@
 -	$(INSTALL) -d $(DESTDIR)/@storage_dir@
  
- sbin_PROGRAMS = knotc knotd
- 
diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index dae8d40455bd..77244464f0e7 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "knot-dns";
-  version = "3.5.8";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "https://knot-dns.nic.cz/release/knot-${finalAttrs.version}.tar.xz";
-    sha256 = "4197c902feccf32475b254c7ddaa1ac123700e3895f50b80103ffeb8352a2807";
+    sha256 = "922894f04a2835131a24c3b3edcbf761273c1b37d3dc4e46d6923ee3856af130";
   };
 
   outputs = [
@@ -62,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./runtime-deps.patch
   ];
 
+  postPatch = ''
+    substituteInPlace tests/contrib/test_time.c \
+      --replace-fail 'test_time_print();' ""
+  '';
+
   # FIXME: sphinx is needed for now to get man-pages
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/kn/knot-dns/runtime-deps.patch b/pkgs/by-name/kn/knot-dns/runtime-deps.patch
index 89dba415b3b9..9e8488bb4b33 100644
--- a/pkgs/by-name/kn/knot-dns/runtime-deps.patch
+++ b/pkgs/by-name/kn/knot-dns/runtime-deps.patch
@@ -5,9 +5,8 @@ but that contains also references like include paths.
 Filter these at least in a crude way (whole lines).
 --- a/configure.ac
 +++ b/configure.ac
-@@ -788,5 +788,5 @@ result_msg_base="
+@@ -947,3 +947,3 @@
+ 
 -result_msg_esc=$(echo -n "    Configure:$filtered_config_params\n$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n')
 +result_msg_esc=$(echo -n "    Configure:$filtered_config_params\n$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n')
  
- AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary])
-