Index: Mk/Scripts/check_leftovers.sh
===================================================================
--- Mk/Scripts/check_leftovers.sh
+++ Mk/Scripts/check_leftovers.sh
@@ -66,6 +66,8 @@
 		/var/tmp/*) continue ;;
 		# fc-cache - skip for now
 		/var/db/fontconfig/*) continue ;;
+		# dbus-uuidgen - skip for now
+		/var/lib/dbus/machine-id) continue ;;
 	esac
 
 	ignore_path=0
Index: devel/dbus/Makefile
===================================================================
--- devel/dbus/Makefile
+++ devel/dbus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	1.10.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
Index: devel/dbus/pkg-plist
===================================================================
--- devel/dbus/pkg-plist
+++ devel/dbus/pkg-plist
@@ -54,5 +54,4 @@
 @dir /var/lib/dbus
 @dir /var/lib
 @dir /var/run/dbus
-@comment The following line may be removed after 2018-01-01
-@postexec [ -f /var/lib/dbus/machine-id -o ! -f /var/db/dbus/machine-id ] || cp -p /var/db/dbus/machine-id /var/lib/dbus/
+@postexec %%PREFIX%%/bin/dbus-uuidgen --ensure