diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index ce00d9b..2c95b08 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -4976,13 +4976,19 @@
 
 void get_bootloader_version(unsigned char *buf)
 {
-	snprintf((char*)buf, MAX_RSP_SIZE, "%s",  device.bootloader_version);
+	/* Show SW and modem version and internal storage size on fastboot screen start */
+	//snprintf((char*)buf, MAX_RSP_SIZE, "%s",  device.bootloader_version);
+	memcpy(buf, ARIMA_BOOTLOADER_VERSION, MAX_VERSION_LEN);
+	dprintf(CRITICAL, "ARIMA_BOOTLOADER_VERSION:%s\n",ARIMA_BOOTLOADER_VERSION);
 	return;
 }
 
 void get_baseband_version(unsigned char *buf)
 {
-	snprintf((char*)buf, MAX_RSP_SIZE, "%s", device.radio_version);
+	/* Show SW and modem version and internal storage size on fastboot screen start */
+	//snprintf((char*)buf, MAX_RSP_SIZE, "%s", device.radio_version);
+	memcpy(buf, ARIMA_BASEBAND_VERSION, MAX_VERSION_LEN);
+	dprintf(CRITICAL, "ARIMA_BASEBAND_VERSION:%s\n",ARIMA_BASEBAND_VERSION);
 	return;
 }
 
diff --git a/makefile b/makefile
old mode 100644
new mode 100755
index 9e9e861..d185daa
--- a/makefile
+++ b/makefile
@@ -180,6 +180,10 @@
   DEFINES += TARGET_USE_SYSTEM_AS_ROOT_IMAGE=0
 endif
 
+DEFINES += ARIMA_BASEBAND_VERSION=
+DEFINES += ARIMA_BOOTLOADER_VERSION=
+$(warning DEFINES : $(DEFINES))
+
 # these need to be filled out by the project/target/platform rules.mk files
 TARGET :=
 PLATFORM :=