diff --git a/nova/conf/xenserver.py b/nova/conf/xenserver.py
index 8722cc37d044..a3cda8bfd827 100644
--- a/nova/conf/xenserver.py
+++ b/nova/conf/xenserver.py
@@ -438,6 +438,13 @@ volume provider then the value from this option is taken.
     # when we pull support for it, we should remove this
     cfg.BoolOpt('remap_vbd_dev',
         default=False,
+        deprecated_for_removal=True,
+        deprecated_since='15.0.0',
+        deprecated_reason="""
+This option provided a workaround for issues in Ubuntu Maverick, which
+was released in April 2010 and was dropped from support in April 2012.
+There's no reason to continue supporting this option.
+""",
         help="""
 Used to enable the remapping of VBD dev.
 (Works around an issue in Ubuntu Maverick)
diff --git a/releasenotes/notes/deprecate-remap_vbd_dev-opt-c1690c5b447f0053.yaml b/releasenotes/notes/deprecate-remap_vbd_dev-opt-c1690c5b447f0053.yaml
new file mode 100644
index 000000000000..9ce1bc58c169
--- /dev/null
+++ b/releasenotes/notes/deprecate-remap_vbd_dev-opt-c1690c5b447f0053.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``remap_vbd_dev`` option is deprecated and will be removed in a future
+    release.