diff --git a/Makefile b/Makefile
index 35e375d..82210a3 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ARDUINO_INSTALL_DIR ?= $(HOME)/arduino-1.8.11
 COPY_INO := $(shell cp $(FBARDUINO_FIRMWARE_SRC_DIR)/src.ino $(FBARDUINO_FIRMWARE_SRC_DIR)/src.ino.cpp)
 CXX_SRC := $(wildcard $(FBARDUINO_FIRMWARE_SRC_DIR)/*.cpp)
 SRC := $(CXX_SRC)
-SRC_DEPS := $(SRC) $(wildcard $(FBARDUINO_FIRMWARE_SRC_DIR)/*.h)
+HEADERS := $(wildcard $(FBARDUINO_FIRMWARE_SRC_DIR)/*.h)
 
 # Object files and Dependency files That will eventually be built.
 CXX_OBJ := $(CXX_SRC:.cpp=.o)
@@ -67,11 +67,11 @@ strings_test: all
 	$(OBJ_COPY) -I ihex $(TARGET_farmduino_k14_HEX) -O binary $(TARGET_farmduino_k14_HEX).bin
 	$(OBJ_COPY) -I ihex $(TARGET_farmduino_k15_HEX) -O binary $(TARGET_farmduino_k15_HEX).bin
 	$(OBJ_COPY) -I ihex $(TARGET_express_k10_HEX) -O binary $(TARGET_express_k10_HEX).bin
-	@strings $(TARGET_ramps_v14_HEX).bin | grep -q "6.5.0.R.genesisK12"
-	@strings $(TARGET_farmduino_v10_HEX).bin | grep -q "6.5.0.F.genesisK13"
-	@strings $(TARGET_farmduino_k14_HEX).bin | grep -q "6.5.0.G.genesisK14"
-	@strings $(TARGET_farmduino_k15_HEX).bin | grep -q "6.5.0.H.genesisK15"
-	@strings $(TARGET_express_k10_HEX).bin | grep -q "6.5.0.E.expressK10"
+	@strings $(TARGET_ramps_v14_HEX).bin | grep -q ".R.genesisK12"
+	@strings $(TARGET_farmduino_v10_HEX).bin | grep -q ".F.genesisK13"
+	@strings $(TARGET_farmduino_k14_HEX).bin | grep -q ".G.genesisK14"
+	@strings $(TARGET_farmduino_k15_HEX).bin | grep -q ".H.genesisK15"
+	@strings $(TARGET_express_k10_HEX).bin | grep -q ".E.expressK10"
 
 force_clean: remove_ino_copy
 	$(RM) -r $(BUILD_DIR) $(BIN_DIR)
diff --git a/lib/targets/express_k10.Makefile b/lib/targets/express_k10.Makefile
index 527dd24..17918e3 100644
--- a/lib/targets/express_k10.Makefile
+++ b/lib/targets/express_k10.Makefile
@@ -12,7 +12,7 @@ $(TARGET_express_k10_BUILD_DIR)/express_k10.eep: $(TARGET_express_k10_BUILD_DIR)
 $(TARGET_express_k10_BUILD_DIR)/express_k10.elf: $(TARGET_express_k10_OBJ)
 	$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_express_k10_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
 
-$(TARGET_express_k10_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
+$(TARGET_express_k10_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp $(HEADERS)
 	$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=3 $(DEPS_CFLAGS) $< -o $@
 
 $(TARGET_express_k10_BUILD_DIR):
diff --git a/lib/targets/farmduino_k14.Makefile b/lib/targets/farmduino_k14.Makefile
index eab53b3..32d305e 100644
--- a/lib/targets/farmduino_k14.Makefile
+++ b/lib/targets/farmduino_k14.Makefile
@@ -12,7 +12,7 @@ $(TARGET_farmduino_k14_BUILD_DIR)/farmduino_k14.eep: $(TARGET_farmduino_k14_BUIL
 $(TARGET_farmduino_k14_BUILD_DIR)/farmduino_k14.elf: $(TARGET_farmduino_k14_OBJ)
 	$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_farmduino_k14_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
 
-$(TARGET_farmduino_k14_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
+$(TARGET_farmduino_k14_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp $(HEADERS)
 	$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=2 $(DEPS_CFLAGS) $< -o $@
 
 $(TARGET_farmduino_k14_BUILD_DIR):
diff --git a/lib/targets/farmduino_k15.Makefile b/lib/targets/farmduino_k15.Makefile
index dd0df8f..381089b 100644
--- a/lib/targets/farmduino_k15.Makefile
+++ b/lib/targets/farmduino_k15.Makefile
@@ -12,7 +12,7 @@ $(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.eep: $(TARGET_farmduino_k15_BUIL
 $(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.elf: $(TARGET_farmduino_k15_OBJ)
 	$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_farmduino_k15_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
 
-$(TARGET_farmduino_k15_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
+$(TARGET_farmduino_k15_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp $(HEADERS)
 	$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=4 $(DEPS_CFLAGS) $< -o $@
 
 $(TARGET_farmduino_k15_BUILD_DIR):
diff --git a/lib/targets/farmduino_v10.Makefile b/lib/targets/farmduino_v10.Makefile
index 39c186f..ecbb333 100644
--- a/lib/targets/farmduino_v10.Makefile
+++ b/lib/targets/farmduino_v10.Makefile
@@ -12,7 +12,7 @@ $(TARGET_farmduino_v10_BUILD_DIR)/farmduino_v10.eep: $(TARGET_farmduino_v10_BUIL
 $(TARGET_farmduino_v10_BUILD_DIR)/farmduino_v10.elf: $(TARGET_farmduino_v10_OBJ)
 	$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_farmduino_v10_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
 
-$(TARGET_farmduino_v10_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
+$(TARGET_farmduino_v10_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp $(HEADERS)
 	$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=1 $(DEPS_CFLAGS) $< -o $@
 
 $(TARGET_farmduino_v10_BUILD_DIR):
diff --git a/lib/targets/ramps_v14.Makefile b/lib/targets/ramps_v14.Makefile
index 1c5b43d..856577c 100644
--- a/lib/targets/ramps_v14.Makefile
+++ b/lib/targets/ramps_v14.Makefile
@@ -12,7 +12,7 @@ $(TARGET_ramps_v14_BUILD_DIR)/arduino_firmware.eep: $(TARGET_ramps_v14_BUILD_DIR
 $(TARGET_ramps_v14_BUILD_DIR)/arduino_firmware.elf: $(TARGET_ramps_v14_OBJ)
 	$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_ramps_v14_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
 
-$(TARGET_ramps_v14_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
+$(TARGET_ramps_v14_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp $(HEADERS)
 	$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=0 $(DEPS_CFLAGS) $< -o $@
 
 $(TARGET_ramps_v14_BUILD_DIR):
diff --git a/src/Config.h b/src/Config.h
index 154e40d..0c630b4 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -9,6 +9,8 @@
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
+  const char SOFTWARE_VERSION[] = "6.5.1\0";
+
   const int LOGGING = 0;
 
   const int INCOMING_CMD_BUF_SIZE = 100;
@@ -224,8 +226,6 @@
 
   const long STATUS_GENERAL_DEFAULT = 0;
 
-//const char SOFTWARE_VERSION[] = "4.0.2\0";
-
 #define NSS_PIN 22 
 #define READ_ENA_PIN 49
 #define NULL 0
@@ -240,22 +240,22 @@ enum MdlSpiEncoders
 };
 #endif /* CONFIG_H_ */
 
-#if defined(RAMPS_V14) && !defined(SOFTWARE_VERSION)
-#define SOFTWARE_VERSION "6.5.0.R.genesisK12\0"
+#if defined(RAMPS_V14) && !defined(SOFTWARE_VERSION_SUFFIX)
+#define SOFTWARE_VERSION_SUFFIX ".R.genesisK12\0"
 #endif
 
-#if defined(FARMDUINO_V10) && !defined(SOFTWARE_VERSION)
-#define SOFTWARE_VERSION "6.5.0.F.genesisK13\0"
+#if defined(FARMDUINO_V10) && !defined(SOFTWARE_VERSION_SUFFIX)
+#define SOFTWARE_VERSION_SUFFIX ".F.genesisK13\0"
 #endif
 
-#if defined(FARMDUINO_V14) && !defined(SOFTWARE_VERSION)
-#define SOFTWARE_VERSION "6.5.0.G.genesisK14\0"
+#if defined(FARMDUINO_V14) && !defined(SOFTWARE_VERSION_SUFFIX)
+#define SOFTWARE_VERSION_SUFFIX ".G.genesisK14\0"
 #endif
 
-#if defined(FARMDUINO_V30) && !defined(SOFTWARE_VERSION)
-#define SOFTWARE_VERSION "6.5.0.H.genesisK15\0"
+#if defined(FARMDUINO_V30) && !defined(SOFTWARE_VERSION_SUFFIX)
+#define SOFTWARE_VERSION_SUFFIX ".H.genesisK15\0"
 #endif
 
-#if defined(FARMDUINO_EXP_V20) && !defined(SOFTWARE_VERSION)
-#define SOFTWARE_VERSION "6.5.0.E.expressK10\0"
+#if defined(FARMDUINO_EXP_V20) && !defined(SOFTWARE_VERSION_SUFFIX)
+#define SOFTWARE_VERSION_SUFFIX ".E.expressK10\0"
 #endif
diff --git a/src/F83Handler.cpp b/src/F83Handler.cpp
index 422c1b1..3aea3e6 100644
--- a/src/F83Handler.cpp
+++ b/src/F83Handler.cpp
@@ -34,6 +34,7 @@ int F83Handler::execute(Command *command)
 
   Serial.print("R83 ");
   Serial.print(SOFTWARE_VERSION);
+  Serial.print(SOFTWARE_VERSION_SUFFIX);
   //Serial.print("\r\n");
   CurrentState::getInstance()->printQAndNewLine();