diff --git a/Knot.files b/Knot.files
index 34ed98a8f7edf23512aeb7dcb6f0e9581b25c2f6..65b4712014b60ee45d8c88d289a5c5b132b6cf37 100644
--- a/Knot.files
+++ b/Knot.files
@@ -244,7 +244,6 @@ src/knot/dnssec/zone-nsec.c
 src/knot/dnssec/zone-nsec.h
 src/knot/dnssec/zone-sign.c
 src/knot/dnssec/zone-sign.h
-src/knot/main.c
 src/knot/modules/dnsproxy.c
 src/knot/modules/dnsproxy.h
 src/knot/modules/dnstap.c
@@ -467,6 +466,7 @@ src/utils/knotc/estimator.h
 src/utils/knotc/main.c
 src/utils/knotc/remote.c
 src/utils/knotc/remote.h
+src/utils/knotd/main.c
 src/utils/knsupdate/knsupdate_exec.c
 src/utils/knsupdate/knsupdate_exec.h
 src/utils/knsupdate/knsupdate_main.c
diff --git a/configure.ac b/configure.ac
index 7b6222cb4e492f27e8242d1d5e43c9a858f78012..aad237c9f9c37564722d3fcda5ec2aab99b66849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_define([knot_PKG_VERSION],[knot_VERSION_MAJOR.knot_VERSION_MINOR.knot_VERSION
 AC_INIT([knot], knot_PKG_VERSION, [knot-dns@labs.nic.cz])
 AM_INIT_AUTOMAKE([gnits subdir-objects no-dist-gzip dist-xz -Wall -Werror])
 AM_SILENT_RULES([yes])
-AC_CONFIG_SRCDIR([src/knot/main.c])
+AC_CONFIG_SRCDIR([src/knot])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_USE_SYSTEM_EXTENSIONS([_GNU_SOURCE])
diff --git a/src/Makefile.am b/src/Makefile.am
index 8865614c97a85f29ce3b2a3365ff1f4e18116492..168a597912aa02bfdc1888266c604d812f41180b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,7 +212,7 @@ knotc_SOURCES =					\
 	utils/knotc/main.c
 
 knotd_SOURCES =					\
-	knot/main.c
+	utils/knotd/main.c
 
 knot1to2_SOURCES =				\
 	utils/knot1to2/cf-lex.c			\
diff --git a/src/knot/main.c b/src/utils/knotd/main.c
similarity index 100%
rename from src/knot/main.c
rename to src/utils/knotd/main.c
diff --git a/tests-fuzz/Makefile.am b/tests-fuzz/Makefile.am
index a58474efa87f924302f3288d0d3ad61719b1ed80..5a4b087a228b2a039ad099f43362b6b8e66dd5da 100644
--- a/tests-fuzz/Makefile.am
+++ b/tests-fuzz/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
 	-include $(top_builddir)/src/config.h \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/dnssec/lib 
+	-I$(top_srcdir)/src/dnssec/lib
 
 LDADD = \
 	$(top_builddir)/src/libknot.la
@@ -18,5 +18,5 @@ endif
 knotd_stdio_SOURCES = wrap/server.c wrap/tcp-handler.c wrap/udp-handler.c
 knotd_stdio_CPPFLAGS = $(AM_CPPFLAGS) $(liburcu_CFLAGS)
 knotd_stdio_LDADD = \
-	$(top_builddir)/src/knot/knotd-main.o \
+	$(top_builddir)/src/utils/knotd/knotd-main.o \
 	$(top_builddir)/src/libknotd.la $(liburcu_LIBS)