diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b43d01a89..9f0e29f176 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-23  David S. Miller  <davem@davemloft.net>
+
+	* configure.tgt (sparc-*-linux*): Set build_gdbserver to yes.
+
 2012-04-23  Tom Tromey  <tromey@redhat.com>
 
 	* buildsym.c (add_free_pendings): Remove.
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 6b4a504a24..19c990ed5e 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -481,6 +481,7 @@ sparc-*-linux*)
 	    gdb_target_obs="sparc64-tdep.o sparc64-sol2-tdep.o \
 			    sparc64-linux-tdep.o ${gdb_target_obs}"
 	fi
+	build_gdbserver=yes
 	;;
 sparc64-*-linux*)
 	# Target: GNU/Linux UltraSPARC