diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index c71712830a..c890801ee4 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -17,7 +17,7 @@ LDADDS = $(GDK_DEP_LIBS)
 
 noinst_LTLIBRARIES = libgdk-broadway.la
 
-libexec_PROGRAMS = broadway-server
+libexec_PROGRAMS = broadwayd
 
 libgdkinclude_HEADERS = 	\
 	gdkbroadway.h
@@ -75,15 +75,15 @@ libgdk_broadway_la_SOURCES =		\
 	gdkbroadway-server.h	\
 	gdkbroadway-server-client.c
 
-broadway_server_SOURCES = \
+broadwayd_SOURCES = \
 	broadway-protocol.h		\
-	broadway-server.c 		\
+	broadwayd.c 			\
 	gdkbroadway-server.h		\
 	gdkbroadway-server.c		\
 	broadway-output.h		\
 	broadway-output.c
 
-broadway_server_LDADD = $(GDK_DEP_LIBS) -lrt
+broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt
 
 MAINTAINERCLEANFILES = $(broadway_built_sources)
 EXTRA_DIST += $(broadway_built_sources)
diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadwayd.c
similarity index 100%
rename from gdk/broadway/broadway-server.c
rename to gdk/broadway/broadwayd.c