--- Makefile.in.orig
+++ Makefile.in
@@ -33,12 +33,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = awesome$(EXEEXT) awesome-client$(EXEEXT) \
-	awesome-message$(EXEEXT) awesome-menu$(EXEEXT)
-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@am__append_1 = awesome.1 \
-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome-client.1 \
-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome-message.1 \
-@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome-menu.1 \
+bin_PROGRAMS = awesome2$(EXEEXT) awesome2-client$(EXEEXT) \
+	awesome2-message$(EXEEXT) awesome2-menu$(EXEEXT)
+@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@am__append_1 = awesome2.1 \
+@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome2-client.1 \
+@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome2-message.1 \
+@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesome2-menu.1 \
 @HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@	awesomerc.5
 @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@am__append_2 = optsdocgen.txt \
 @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@	rcskeletongen.txt \
@@ -278,8 +278,8 @@
 #       restart the whole dist process from the start and there is none.
 EXTRA_DIST = UPGRADE LICENSE UPGRADE STYLE awesomerc.in \
 	build-utils/uicbgen.sh build-utils/layoutgen.sh \
-	build-utils/widgetgen.sh awesome.1.txt awesome-client.1.txt \
-	awesome-message.1.txt awesome-menu.1.txt awesomerc.5.txt \
+	build-utils/widgetgen.sh awesome2.1.txt awesome2-client.1.txt \
+	awesome2-message.1.txt awesome2-menu.1.txt awesomerc.5.txt \
 	build-utils/extractuicbdoc.py build-utils/extractoptsdoc.py \
 	build-utils/extractrcskeleton.py build-utils/package-version \
 	awesome.doxygen.in
@@ -496,17 +496,17 @@
 	widgets/$(DEPDIR)/$(am__dirstamp)
 widgets/common.$(OBJEXT): widgets/$(am__dirstamp) \
 	widgets/$(DEPDIR)/$(am__dirstamp)
-awesome$(EXEEXT): $(awesome_OBJECTS) $(awesome_DEPENDENCIES) 
-	@rm -f awesome$(EXEEXT)
+awesome2$(EXEEXT): $(awesome_OBJECTS) $(awesome_DEPENDENCIES) 
+	@rm -f awesome2$(EXEEXT)
 	$(LINK) $(awesome_OBJECTS) $(awesome_LDADD) $(LIBS)
-awesome-client$(EXEEXT): $(awesome_client_OBJECTS) $(awesome_client_DEPENDENCIES) 
-	@rm -f awesome-client$(EXEEXT)
+awesome2-client$(EXEEXT): $(awesome_client_OBJECTS) $(awesome_client_DEPENDENCIES) 
+	@rm -f awesome2-client$(EXEEXT)
 	$(LINK) $(awesome_client_OBJECTS) $(awesome_client_LDADD) $(LIBS)
-awesome-menu$(EXEEXT): $(awesome_menu_OBJECTS) $(awesome_menu_DEPENDENCIES) 
-	@rm -f awesome-menu$(EXEEXT)
+awesome2-menu$(EXEEXT): $(awesome_menu_OBJECTS) $(awesome_menu_DEPENDENCIES) 
+	@rm -f awesome2-menu$(EXEEXT)
 	$(LINK) $(awesome_menu_OBJECTS) $(awesome_menu_LDADD) $(LIBS)
-awesome-message$(EXEEXT): $(awesome_message_OBJECTS) $(awesome_message_DEPENDENCIES) 
-	@rm -f awesome-message$(EXEEXT)
+awesome2-message$(EXEEXT): $(awesome_message_OBJECTS) $(awesome_message_DEPENDENCIES) 
+	@rm -f awesome2-message$(EXEEXT)
 	$(LINK) $(awesome_message_OBJECTS) $(awesome_message_LDADD) $(LIBS)
 
 mostlyclean-compile: