diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e3c5063b8f..c732c2da6f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-27  Tom Tromey  <tom@tromey.com>
+
+	* Makefile.in (SUBDIR_CLI_OBS): Redefine.
+	(%.o): Remove cli rule.
+	(CONFIG_SRC_SUBDIR): Add cli.
+
 2017-11-27  Tom Tromey  <tom@tromey.com>
 
 	* configure.ac (CONFIG_SRC_SUBDIR): Don't subst.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index bbe4287ced..b9e1e40596 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -235,16 +235,6 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
 #
 # CLI sub directory definitons
 #
-SUBDIR_CLI_OBS = \
-	cli-cmds.o \
-	cli-decode.o \
-	cli-dump.o \
-	cli-interp.o \
-	cli-logging.o \
-	cli-script.o \
-	cli-setshow.o \
-	cli-utils.o
-
 SUBDIR_CLI_SRCS = \
 	cli/cli-cmds.c \
 	cli/cli-decode.c \
@@ -255,6 +245,8 @@ SUBDIR_CLI_SRCS = \
 	cli/cli-setshow.c \
 	cli/cli-utils.c
 
+SUBDIR_CLI_OBS = $(patsubst %.c,%.o,$(SUBDIR_CLI_SRCS))
+
 SUBDIR_CLI_DEPS =
 SUBDIR_CLI_LDFLAGS =
 SUBDIR_CLI_CFLAGS =
@@ -647,7 +639,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
 CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
 HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
 
-CONFIG_SRC_SUBDIR = arch
+CONFIG_SRC_SUBDIR = arch cli
 CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
 
 # -I. for config files.
@@ -1938,10 +1930,6 @@ $(CONFIG_DEP_SUBDIR):
 	$(SHELL) $(srcdir)/../mkinstalldirs $@
 
 # Rules for compiling .c files in the various source subdirectories.
-%.o: $(srcdir)/cli/%.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-
 %.o: ${srcdir}/common/%.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)