diff --git a/package/klish/klish.conf b/package/klish/klish.conf
index bdb17162..eef53973 100644
--- a/package/klish/klish.conf
+++ b/package/klish/klish.conf
@@ -1,17 +1,10 @@
-# Template for config file /etc/klish/klish.conf. It's used by klish utility.
+# Overrides for config file /etc/klish/klish.conf
 
-# The klishd uses UNIX domain socket to receive connections. It will create an
-# filesystem entry to allow clients to find connection point. By default klish
-# client utility will connect to /tmp/klish-unix-socket.
-#UnixSocketPath=/tmp/klish-unix-socket
+UnixSocketPath=/run/klishd.sock
 
-# The klish can use external pager for non-interactive commands. By default it
-# will execute "/usr/bin/less -I -F -e -X -K -d -r -S" process as a pager.
+# Klish can use an external pager for all output
 Pager="/usr/bin/less -I -F -e -X -K -d -r -S"
-
-# External pager is enabled by default. But user can explicitly enable or
-# disable it. Use "y" or "n" values.
-#UsePager=y
+UsePager=y
 
 # Set max size of history. By default 100 lines are saved, for every new
 # line after that, the oldest line is dropped. Set to 0 for unlimited.
diff --git a/package/klish/klish.mk b/package/klish/klish.mk
index f3fd4051..8ecedddc 100644
--- a/package/klish/klish.mk
+++ b/package/klish/klish.mk
@@ -20,8 +20,8 @@ KLISH_CONF_OPTS += --with-libxml2
 define KLISH_INSTALL_CONFIG
 	$(INSTALL) -t $(TARGET_DIR)/etc/klish -D -m 0644 \
 		$(@D)/plugins/klish/xml/ptypes.xml
-	$(INSTALL) -t $(TARGET_DIR)/etc/klish -D -m 0644 \
-		$(KLISH_PKGDIR)/klish.conf $(@D)/klishd.conf
+	$(INSTALL) -m 0644 $(KLISH_PKGDIR)/klish.conf $(@D)/klish.conf
+	$(INSTALL) -m 0644 $(KLISH_PKGDIR)/klishd.conf $(@D)/klishd.conf
 endef
 KLISH_POST_INSTALL_TARGET_HOOKS += KLISH_INSTALL_CONFIG
 
diff --git a/package/klish/klishd.conf b/package/klish/klishd.conf
new file mode 100644
index 00000000..d28de10d
--- /dev/null
+++ b/package/klish/klishd.conf
@@ -0,0 +1,5 @@
+# Overrides for config file /etc/klish/klishd.conf
+
+UnixSocketPath=/run/klishd.sock
+
+DBs=libxml2