diff --git a/client/cmds.m4 b/client/cmds.m4
new file mode 100644
index 00000000..d24bbb09
--- /dev/null
+++ b/client/cmds.m4
@@ -0,0 +1,10 @@
+#
+#	BIRD -- Internal Commands Of The Client
+#
+#	(c) 2000 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#
+#	Can be freely distributed and used under the terms of the GNU GPL.
+#
+
+CF_CLI(QUIT,,, [[Quit the client]])
+CF_CLI(EXIT,,, [[Exit the client]])
diff --git a/conf/Makefile b/conf/Makefile
index 853cd832..9dff4582 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -20,8 +20,8 @@ cf-parse.y: $(conf-fragments) $(conf-src)/gen_parser.m4
 keywords.h: $(conf-fragments) $(conf-src)/gen_keywords.m4
 	$(M4) -P $(conf-src)/gen_keywords.m4 $(conf-fragments) >keywords.h
 
-commands.h: $(conf-fragments) $(conf-src)/gen_commands.m4
-	$(M4) -P $(conf-src)/gen_commands.m4 $(conf-fragments) | sort >commands.h
+commands.h: $(conf-fragments) $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4
+	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
 
 cf-lex.c: cf-lex.l
 	$(FLEX) $(FLEX_DEBUG) -sB8 -ocf-lex.c -Pcf_ cf-lex.l