diff --git a/configure.ac b/configure.ac
index 20733eb2..81111fe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,22 @@
 AC_PREREQ([2.64])
+
+m4_define([wayland_major_version], [0])
+m4_define([wayland_minor_version], [85])
+m4_define([wayland_micro_version], [1])
+m4_define([wayland_version],
+          [wayland_major_version.wayland_minor_version.wayland_micro_version])
+
 AC_INIT([wayland],
-        [0.85.0],
+        [wayland_version],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
         [wayland],
         [http://wayland.freedesktop.org/])
 
+AC_SUBST([WAYLAND_VERSION_MAJOR], [wayland_major_version])
+AC_SUBST([WAYLAND_VERSION_MINOR], [wayland_minor_version])
+AC_SUBST([WAYLAND_VERSION_MICRO], [wayland_micro_version])
+AC_SUBST([WAYLAND_VERSION], [wayland_version])
+
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -52,5 +64,6 @@ AC_CONFIG_FILES([Makefile
 		 wayland-scanner.m4
 		 src/Makefile
 		 src/wayland-server.pc
-		 src/wayland-client.pc])
+		 src/wayland-client.pc
+		 src/wayland-version.h])
 AC_OUTPUT
diff --git a/src/.gitignore b/src/.gitignore
index 1813f890..1fb2e116 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,3 +2,4 @@ wayland-scanner
 wayland-client-protocol.h
 wayland-protocol.c
 wayland-server-protocol.h
+/wayland-version.h
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index f356b54c..72172367 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,8 @@ include_HEADERS =				\
 	wayland-server.h			\
 	wayland-client-protocol.h		\
 	wayland-client.h			\
-	wayland-egl.h
+	wayland-egl.h				\
+	wayland-version.h
 
 libwayland_util_la_SOURCES =			\
 	connection.c				\
@@ -61,3 +62,5 @@ BUILT_SOURCES =					\
 	wayland-protocol.c
 
 CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = wayland-version.h
+EXTRA_DIST = wayland-version.h.in
diff --git a/src/wayland-server.h b/src/wayland-server.h
index 53f918c1..4f73c401 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -30,6 +30,7 @@ extern "C" {
 #include <stdint.h>
 #include "wayland-util.h"
 #include "wayland-server-protocol.h"
+#include "wayland-version.h"
 
 enum {
 	WL_EVENT_READABLE = 0x01,
diff --git a/src/wayland-server.pc.in b/src/wayland-server.pc.in
index 36e60cca..8e3214e4 100644
--- a/src/wayland-server.pc.in
+++ b/src/wayland-server.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
  
 Name: Wayland Server
 Description: Server side implementation of the Wayland protocol
-Version: 0.85
+Version: @WAYLAND_VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lwayland-server
diff --git a/src/wayland-version.h.in b/src/wayland-version.h.in
new file mode 100644
index 00000000..9a746caf
--- /dev/null
+++ b/src/wayland-version.h.in
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef WAYLAND_VERSION_H
+#define WAYLAND_VERSION_H
+
+#define WAYLAND_VERSION_MAJOR @WAYLAND_VERSION_MAJOR@
+#define WAYLAND_VERSION_MINOR @WAYLAND_VERSION_MINOR@
+#define WAYLAND_VERSION_MICRO @WAYLAND_VERSION_MICRO@
+#define WAYLAND_VERSION "@WAYLAND_VERSION@"
+
+#endif