diff --git a/CHANGELOG b/CHANGELOG
index f6dac82..b240a26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.85......Add missing system file to properly compare and merge files upon upgrades.
 1.0.84......Minor GUI fixes, revert makewhatis file addition.
 1.0.83......Improve jail/base update, execute fetch/install commands individually.
 1.0.82......Add missing system file to prevent makewhatis not found warning.
diff --git a/bastille-init b/bastille-init
index be9ccb6..c65d932 100755
--- a/bastille-init
+++ b/bastille-init
@@ -391,6 +391,11 @@ include_files()
 				install -m 0555 ${SYSTEM_INCLUDE}/sum /usr/bin/sum
 			fi
 		fi
+		if [ ! -f "/usr/bin/diff3" ]; then
+			if [ -f "${SYSTEM_INCLUDE}/diff3" ]; then
+				install -m 0555 ${SYSTEM_INCLUDE}/diff3 /usr/bin/diff3
+			fi
+		fi
 	else
 		sysrc -f ${CWDIR}${EXTCONF} VNET_ENABLE="NO" >/dev/null 2>&1
 	fi
@@ -932,7 +937,7 @@ remove_addon()
 		fi
 	done
 
-	BIN_FILES="/usr/local/bin/jib /usr/sbin/setfib /usr/bin/sum /usr/bin/makewhatis"
+	BIN_FILES="/usr/local/bin/jib /usr/sbin/setfib /usr/bin/sum /usr/bin/diff3"
 	for FILE in ${BIN_FILES}; do
 		if [ -f "${FILE}" ]; then
 			rm -rf ${FILE}
diff --git a/conf/system/include/12.1/diff3 b/conf/system/include/12.1/diff3
new file mode 100755
index 0000000..cdd6238
Binary files /dev/null and b/conf/system/include/12.1/diff3 differ
diff --git a/conf/system/include/12.2/diff3 b/conf/system/include/12.2/diff3
new file mode 100755
index 0000000..d6080b2
Binary files /dev/null and b/conf/system/include/12.2/diff3 differ
diff --git a/version b/version
index 7260243..8bdc532 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.84
+1.0.85