diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf
index 001042e5420..b46aefcc7bd 100644
--- a/etc/freebsd-update.conf
+++ b/etc/freebsd-update.conf
@@ -28,7 +28,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
 
 # When upgrading to a new FreeBSD release, files which match MergeChanges
 # will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/
+MergeChanges /etc/ /var/named/etc/ /boot/device.hints
 
 ### Default configuration options: