diff --git a/Makefile b/Makefile
index 52c4d7b..4e22f48 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ install-networkmanager:
 
 	install -d $(DESTDIR)/usr/lib/NetworkManager/conf.d
 	install -m 0644 network/nm-30-qubes.conf $(DESTDIR)/usr/lib/NetworkManager/conf.d/30-qubes.conf
+	install -m 0644 network/nm-31-randomize-mac.conf $(DESTDIR)/usr/lib/NetworkManager/conf.d/31-randomize-mac.conf
 
 	install -d $(DESTDIR)/etc/xdg/autostart
 	install -m 0755 network/show-hide-nm-applet.sh $(DESTDIR)$(LIBDIR)/qubes/
diff --git a/debian/qubes-core-agent-network-manager.install b/debian/qubes-core-agent-network-manager.install
index 9af10a9..2b8db2f 100644
--- a/debian/qubes-core-agent-network-manager.install
+++ b/debian/qubes-core-agent-network-manager.install
@@ -2,6 +2,7 @@ etc/NetworkManager/dispatcher.d/30-qubes-external-ip
 etc/NetworkManager/dispatcher.d/qubes-nmhook
 etc/xdg/autostart/00-qubes-show-hide-nm-applet.desktop
 usr/lib/NetworkManager/conf.d/30-qubes.conf
+usr/lib/NetworkManager/conf.d/31-randomize-mac.conf
 usr/lib/qubes/network-manager-prepare-conf-dir
 usr/lib/qubes/qubes-fix-nm-conf.sh
 usr/lib/qubes/show-hide-nm-applet.sh
diff --git a/network/nm-31-randomize-mac.conf b/network/nm-31-randomize-mac.conf
new file mode 100644
index 0000000..9d68d22
--- /dev/null
+++ b/network/nm-31-randomize-mac.conf
@@ -0,0 +1,6 @@
+[device]
+wifi.scan-rand-mac-address=yes
+
+[connection]
+wifi.cloned-mac-address=stable
+connection.stable-id=${CONNECTION}/${BOOT}
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index a34b70f..9ed6baf 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -822,6 +822,7 @@ rm -f %{name}-%{version}
 /etc/NetworkManager/dispatcher.d/qubes-nmhook
 /etc/xdg/autostart/00-qubes-show-hide-nm-applet.desktop
 /usr/lib/NetworkManager/conf.d/30-qubes.conf
+/usr/lib/NetworkManager/conf.d/31-randomize-mac.conf
 /usr/lib/qubes/network-manager-prepare-conf-dir
 /usr/lib/qubes/qubes-fix-nm-conf.sh
 /usr/lib/qubes/show-hide-nm-applet.sh