diff --git a/etc/NetworkManager/conf.d/keyfile.conf.sample b/etc/NetworkManager/conf.d/keyfile.conf.sample
new file mode 100644
index 00000000..d3f73e37
--- /dev/null
+++ b/etc/NetworkManager/conf.d/keyfile.conf.sample
@@ -0,0 +1,9 @@
+[keyfile]
+# Disable misbehaving NIC
+#unmanaged-devices=mac:xx:xx:xx:xx:xx:xx
+#hostname=HOSTNAME_TO_SEND_TO_DHCPD
+# When renaming profiles, also rename the file. Comes with the risk of
+# breaking scripts, but I don't have any of those for this to break.
+rename=true
+
+# vim: filetype=NetworkManager.conf
diff --git a/etc/NetworkManager/conf.d/samples/keyfile.conf b/etc/NetworkManager/conf.d/samples/keyfile.conf
deleted file mode 100644
index 46a053b3..00000000
--- a/etc/NetworkManager/conf.d/samples/keyfile.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#[keyfile]
-# Disable misbehaving NIC
-#unmanaged-devices=mac:xx:xx:xx:xx:xx:xx
-#hostname=HOSTNAME_TO_SEND_TO_DHCPD
-
-# vim: filetype=NetworkManager.conf