diff --git a/Makefile.am b/Makefile.am
index c61bf9034..aaf7c72f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@ bin_PROGRAMS += awesome
 awesome_SOURCES = \
 	client.c client.h \
 	placement.c placement.h \
-	common/awesome-version.c common/awesome-version.h \
+	common/version.c common/version.h \
 	focus.c focus.h \
 	common/draw.c common/draw.h \
 	event.c event.h \
@@ -143,7 +143,7 @@ awesome_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS) $(CONFUSE_LIBS) $(XRANDR_LIB
 bin_PROGRAMS += awesome-client
 awesome_client_SOURCES = \
 	awesome-client.c common/awclient.h \
-	common/awesome-version.c common/awesome-version.h \
+	common/version.c common/version.h \
 	common/awclient.c \
 	common/util.c common/util.h
 
@@ -152,7 +152,7 @@ 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 \
+	common/version.h common/version.c \
 	common/configopts.h common/configopts.c \
 	awesome-message.c
 
diff --git a/awesome-client.c b/awesome-client.c
index 71cd7506e..760079448 100644
--- a/awesome-client.c
+++ b/awesome-client.c
@@ -27,7 +27,7 @@
 #include <sys/un.h>
 
 #include "common/awclient.h"
-#include "common/awesome-version.h"
+#include "common/version.h"
 #include "common/util.h"
 
 /* GNU/Hurd workaround */
diff --git a/awesome-message.c b/awesome-message.c
index 77fe0866f..a58287a59 100644
--- a/awesome-message.c
+++ b/awesome-message.c
@@ -32,7 +32,7 @@
 
 #include "common/swindow.h"
 #include "common/util.h"
-#include "common/awesome-version.h"
+#include "common/version.h"
 #include "common/configopts.h"
 
 #define PROGNAME "awesome-message"
diff --git a/awesome.c b/awesome.c
index 0aadb16f6..a628acf9d 100644
--- a/awesome.c
+++ b/awesome.c
@@ -55,7 +55,7 @@
 #include "tag.h"
 #include "common/awclient.h"
 #include "common/util.h"
-#include "common/awesome-version.h"
+#include "common/version.h"
 #include "common/configopts.h"
 
 static int (*xerrorxlib) (Display *, XErrorEvent *);
diff --git a/common/awesome-version.c b/common/version.c
similarity index 94%
rename from common/awesome-version.c
rename to common/version.c
index b47775820..3d8fead35 100644
--- a/common/awesome-version.c
+++ b/common/version.c
@@ -1,5 +1,5 @@
 /*
- * awesome-version.c - version message utility functions
+ * version.c - version message utility functions
  *
  * Copyright © 2008 Julien Danjou <julien@danjou.info>
  * Copyright © 2008 Hans Ulrich Niedermann <hun@n-dimensional.de>
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "common/awesome-version.h"
+#include "common/version.h"
 #include "awesome-version-internal.h"
 
 /** \brief Print version message and quit program.
diff --git a/common/awesome-version.h b/common/version.h
similarity index 94%
rename from common/awesome-version.h
rename to common/version.h
index 50f803db6..b528e977d 100644
--- a/common/awesome-version.h
+++ b/common/version.h
@@ -1,5 +1,5 @@
 /*
- * awesome-version.h - version message utility functions header
+ * version.h - version message utility functions header
  *
  * Copyright © 2008 Julien Danjou <julien@danjou.info>
  * Copyright © 2008 Hans Ulrich Niedermann <hun@n-dimensional.de>