diff --git a/Makefile b/Makefile
index d99d4d3..2d8b015 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,15 @@ EXTRA_OUTPUT_FILES :=
 LIBRARY_DIRS := $(DEVKITPRO)/libctru
 LIBRARIES := citro3d ctru m
 
-BUILD_FLAGS := -DLIBKHAX_AS_LIB -DVERSION_STRING="\"`git describe --tags --abbrev=0`\""
+BUILD_FLAGS :=
 RUN_FLAGS :=
 
+VERSION_PARTS := $(subst ., ,$(shell git describe --tags --abbrev=0))
+
+VERSION_MAJOR := $(word 1, $(VERSION_PARTS))
+VERSION_MINOR := $(word 2, $(VERSION_PARTS))
+VERSION_MICRO := $(word 3, $(VERSION_PARTS))
+
 # 3DS CONFIGURATION #
 
 TITLE := $(NAME)
diff --git a/buildtools b/buildtools
index 616b50e..73d9327 160000
--- a/buildtools
+++ b/buildtools
@@ -1 +1 @@
-Subproject commit 616b50ec1b82f6dac3a2694ed9d2ba3012f5f6f5
+Subproject commit 73d9327d4227e01c85c6404d7cee747d34e24881
diff --git a/source/ui/section/update.c b/source/ui/section/update.c
index 62729f3..e499a71 100644
--- a/source/ui/section/update.c
+++ b/source/ui/section/update.c
@@ -211,7 +211,10 @@ static void update_check_update(ui_view* view, void* data, float* progress, char
                                     }
 
                                     if(name != NULL && assets != NULL) {
-                                        if(strncmp(name->u.string.ptr, VERSION_STRING, name->u.string.length) != 0) {
+                                        char versionString[16];
+                                        snprintf(versionString, sizeof(versionString), "%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
+
+                                        if(strncmp(name->u.string.ptr, versionString, name->u.string.length) != 0) {
                                             char* url = NULL;
 
                                             for(u32 i = 0; i < assets->u.array.length; i++) {
@@ -341,4 +344,4 @@ void update_open() {
     data->installInfo.finished = true;
 
     prompt_display("Confirmation", "Check for FBI updates?", COLOR_TEXT, true, data, NULL, update_onresponse);
-}
\ No newline at end of file
+}
diff --git a/source/ui/ui.c b/source/ui/ui.c
index 22a45d0..a2d35b5 100644
--- a/source/ui/ui.c
+++ b/source/ui/ui.c
@@ -138,7 +138,7 @@ static void ui_draw_top(ui_view* ui) {
     screen_draw_texture(TEXTURE_TOP_SCREEN_BOTTOM_BAR_SHADOW, topScreenBottomBarX, topScreenBottomBarY - topScreenBottomBarShadowHeight, topScreenBottomBarShadowWidth, topScreenBottomBarShadowHeight);
 
     char verText[64];
-    snprintf(verText, 64, "Ver. %s", VERSION_STRING);
+    snprintf(verText, 64, "Ver. %d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
 
     float verWidth;
     float verHeight;