diff --git a/.gitignore b/.gitignore
index c75bfbeb..c5f25a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ uicbgen.h
 widgetgen.h
 layoutgen.h
 awesome-version-internal.h
+awesome-message
diff --git a/Makefile.am b/Makefile.am
index fa731ed8..86d84df7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,15 +141,15 @@ awesome_client_SOURCES = \
 	common/awclient.c \
 	common/util.c common/util.h
 
-bin_PROGRAMS += awmessage
-awmessage_SOURCES = \
+bin_PROGRAMS += awesome-message
+awesome_message_SOURCES = \
         common/swindow.c common/swindow.h \
         common/draw.c common/draw.h \
 	common/util.h common/util.c \
 	common/awesome-version.h common/awesome-version.c \
-	awmessage.c
+	awesome-message.c
 
-awmessage_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS)
+awesome_message_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS)
 
 EXTRA_DIST += awesome.1.txt
 man_MANS   += awesome.1
diff --git a/awmessage.c b/awesome-message.c
similarity index 100%
rename from awmessage.c
rename to awesome-message.c