diff --git a/source4/Makefile.in b/source4/Makefile.in
index c0e64661863..ce0668b9f10 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -285,7 +285,7 @@ SMBD_NTVFS_OBJ = ntvfs/ntvfs_base.o ntvfs/ntvfs_util.o \
 	ntvfs/ntvfs_generic.o @NTVFS_STATIC@
 
 SMBD_RPC_OBJ = rpc_server/dcerpc_server.o \
-		rpc_server/rpc_echo.o
+		rpc_server/echo/rpc_echo.o
 
 SMBD_OBJ_SRV = smbd/connection.o \
 	       smbd/session.o \
diff --git a/source4/rpc_server/rpc_echo.c b/source4/rpc_server/echo/rpc_echo.c
similarity index 100%
rename from source4/rpc_server/rpc_echo.c
rename to source4/rpc_server/echo/rpc_echo.c