diff --git a/Knot.files b/Knot.files
index c7aac26785819d809e01cd8cb668d817469cc068..2d42bf6a0ca9014a402777da2bc50370adf3a31a 100644
--- a/Knot.files
+++ b/Knot.files
@@ -236,3 +236,4 @@ src/tests/libknot/realdata/libknot_tests_loader_realdata.c
 src/tests/libknot/realdata/libknot_tests_loader_realdata.h
 src/tests/libknot/libknot/zone_tree_tests.c
 src/tests/libknot/libknot/zone_tree_tests.h
+samples/Makefile.am
diff --git a/samples/knotd.conf.in b/knot.sample.conf.in
similarity index 100%
rename from samples/knotd.conf.in
rename to knot.sample.conf.in
diff --git a/samples/Makefile.am b/samples/Makefile.am
index eb0106306c806b27f69a2a7eec3bb0dd8d7c7d91..819401e8d00c4583ab40a80dad3b98a8822a4265 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -5,20 +5,20 @@ edit = sed \
 	-e 's|@prefix[@]|$(prefix)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g'
 
-knotd.conf: Makefile
+knot.sample.conf: Makefile
 	rm -f $@ $@.tmp
 	srcdir=''; \
 	  test -f ./$@.in || srcdir=$(srcdir)/; \
 	  $(edit) $${srcdir}$@.in >$@.tmp
 	mv $@.tmp $@
 
-knotd.conf: knotd.conf.in
+knot.sample.conf: knot.sample.conf.in
 
-install-data-local: knotd.conf
+install-data-local: knot.sample.conf
 	[ -d $(sysconfdir) ] || \
 	  $(INSTALL_DATA) -d $(sysconfdir)
-	[ -f $(sysconfdir)/knotd.conf ] || \
-	  $(INSTALL_DATA) knotd.conf example.com.zone $(sysconfdir)
+	[ -f $(sysconfdir)/knot.sample.conf ] || \
+	  $(INSTALL_DATA) knot.sample.conf example.com.zone $(sysconfdir)
 
 clean-local:
-	rm -f knotd.conf
+	rm -f knot.sample.conf
diff --git a/samples/knot.sample.conf b/samples/knot.full.conf
similarity index 100%
rename from samples/knot.sample.conf
rename to samples/knot.full.conf
diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in
new file mode 100644
index 0000000000000000000000000000000000000000..7084595d096ef5a581901506a8f7ca42a562bef0
--- /dev/null
+++ b/samples/knot.sample.conf.in
@@ -0,0 +1,18 @@
+system {
+  identity "@package@ @version@";
+  storage "@localstatedir@/@package@";
+}
+
+interfaces {
+  my-iface { address 127.0.0.1@5353; }
+}
+
+zones {
+  example.com {
+    file "@sysconfdir@/example.com.zone";
+  }
+}
+
+log {
+  syslog { any warning, error; }
+}