diff --git a/Makefile b/Makefile
index 2e2e61a..5e7bc26 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
 TARGET_NAME := atari800
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+	CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
 
 DEBUG   = 0
 LOG_PERFORMANCE = 1
diff --git a/jni/Android.mk b/jni/Android.mk
index e162219..992e664 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,4 +1,5 @@
 LOCAL_PATH := $(call my-dir)
+GIT_VERSION := " $(shell git rev-parse --short HEAD)"
 
 include $(CLEAR_VARS)
 
diff --git a/libretro/libretro-core.c b/libretro/libretro-core.c
index d54985b..3ab5e4e 100644
--- a/libretro/libretro-core.c
+++ b/libretro/libretro-core.c
@@ -362,7 +362,7 @@ void retro_get_system_info(struct retro_system_info *info)
 {
    memset(info, 0, sizeof(*info));
    info->library_name     = "Atari800";
-   info->library_version  = "3.1.0";
+   info->library_version  = "3.1.0" GIT_VERSION;
    info->valid_extensions = "xfd|atr|cdm|cas|bin|a52|zip";
    info->need_fullpath    = true;
    info->block_extract = false;