diff --git a/man/weston.man b/man/weston.man
index 0e520e05..e7692c79 100644
--- a/man/weston.man
+++ b/man/weston.man
@@ -104,8 +104,11 @@ or you can pass an absolute path. The default backend is
 unless the environment suggests otherwise, see
 .IR DISPLAY " and " WAYLAND_DISPLAY .
 .TP
+.BR \-\-version
+Print the program version.
+.TP
 .BR \-\^h ", " \-\-help
-Print the program version and a summary of command line options, and quit.
+Print a summary of command line options, and quit.
 .TP
 \fB\-\^i\fR\fIN\fR, \fB\-\-idle\-time\fR=\fIN\fR
 Set the idle timeout to
diff --git a/src/compositor.c b/src/compositor.c
index 5ac43f2b..8a2504b0 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3197,6 +3197,7 @@ usage(int error_code)
 
 
 		"Core options:\n\n"
+		"  --version\t\tPrint weston version\n"
 		"  -B, --backend=MODULE\tBackend module, one of drm-backend.so,\n"
 		"\t\t\t\tx11-backend.so or wayland-backend.so\n"
 		"  -S, --socket=NAME\tName of socket to listen on\n"
@@ -3249,6 +3250,7 @@ int main(int argc, char *argv[])
 	int32_t idle_time = 300;
 	int32_t help = 0;
 	char *socket_name = "wayland-0";
+	int32_t version = 0;
 	char *config_file;
 
 	const struct config_key core_config_keys[] = {
@@ -3267,6 +3269,7 @@ int main(int argc, char *argv[])
 		{ WESTON_OPTION_STRING, "modules", 0, &option_modules },
 		{ WESTON_OPTION_STRING, "log", 0, &log },
 		{ WESTON_OPTION_BOOLEAN, "help", 'h', &help },
+		{ WESTON_OPTION_BOOLEAN, "version", 0, &version },
 	};
 
 	argc = parse_options(core_options,
@@ -3275,6 +3278,11 @@ int main(int argc, char *argv[])
 	if (help)
 		usage(EXIT_SUCCESS);
 
+	if (version) {
+		printf(PACKAGE_STRING "\n");
+		return EXIT_SUCCESS;
+	}
+
 	weston_log_file_open(log);
 	
 	weston_log("%s\n"