diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 08a6b58997d..bfad881b7ca 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* Makefile.in (%.o: ../arch/%.c): New rule.
+	(arm.o: ../arch/arm.c): Remove.
+	(arm-linux.o: ../arch/arm-linux.c): Remove.
+	(arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c): Remove.
+	(aarch64-insn.o: ../arch/aarch64-insn.c): Remove.
+
 2017-03-13  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* Makefile.in (%.o: ../nat/%.c): New rule.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index bcf12d017ec..3baa96f4a95 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -735,30 +735,16 @@ ax.o: ax.c
 	$(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
 	$(POSTCOMPILE)
 
-# Arch object files rules form ../arch
-
-arm.o: ../arch/arm.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-arm-linux.o: ../arch/arm-linux.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-arm-get-next-pcs.o: ../arch/arm-get-next-pcs.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-
-# Architecture specific object files rules from ../arch
-
-aarch64-insn.o: ../arch/aarch64-insn.c
-	$(COMPILE) $<
-	$(POSTCOMPILE)
-
 # Rules for objects that go in the gdbserver binary.
 
 %.o: %.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
+%.o: ../arch/%.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
+
 %.o: ../common/%.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)