diff --git a/main.c b/main.c
index a57e12981..6ad9eccf7 100644
--- a/main.c
+++ b/main.c
@@ -9,6 +9,8 @@
 
 #include "dive.h"
 #include "divelist.h"
+#include "libdivecomputer.h"
+#include "version.h"
 
 #include <osm-gps-map.h>
 #ifdef DEBUGFILE
@@ -226,6 +228,11 @@ static void parse_argument(const char *arg)
 				imported = TRUE;
 				return;
 			}
+			if (strcmp(arg, "--version") == 0) {
+				printf("Subsurface v%s, ", VERSION_STRING);
+				printf("built with libdivecomputer v%s\n", dc_version(NULL));
+				exit(0);
+			}
 			/* fallthrough */
 		case 'p':
 			/* ignore process serial number argument when run as native macosx app */