diff --git a/beets/.beetsconfig b/beets/.beetsconfig
deleted file mode 100644
index 3a9a192..0000000
--- a/beets/.beetsconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-
-[beets]
-library: ~/.local/share/beets/library.blb
-directory: /mnt/music/lib/
-plugins: mpdupdate embedart
-
-[paths]
-default: $albumartist/$year - $album/$track - $title
-singleton: Non-Album/$artist - $title
-comp: Compilations/$year - $album/$track - $artist - $title
-
-[mpdupdate]
-host: localhost
-port: 6600
diff --git a/beets/.config/beets/config.yaml b/beets/.config/beets/config.yaml
new file mode 100644
index 0000000..df38ef2
--- /dev/null
+++ b/beets/.config/beets/config.yaml
@@ -0,0 +1,14 @@
+# Automatically migrated from legacy .beetsconfig.
+
+library: ~/.local/share/beets/library.blb
+directory: /mnt/music/lib/
+plugins: mpdupdate embedart
+
+paths:
+    default: $albumartist/$year - $album/$track - $title
+    singleton: Non-Album/$artist - $title
+    comp: Compilations/$year - $album/$track - $artist - $title
+
+mpdupdate:
+    host: localhost
+    port: 6600