diff --git a/litex/build/xilinx/programmer.py b/litex/build/xilinx/programmer.py
index d1ae01bca..38c95364d 100644
--- a/litex/build/xilinx/programmer.py
+++ b/litex/build/xilinx/programmer.py
@@ -112,7 +112,18 @@ def _run_vivado(path, ver, cmds):
     if sys.platform == "win32" or sys.platform == "cygwin":
         vivado_cmd = "vivado -mode tcl"
     else:
-        settings = common.settings(path, "", ver, first="name")
+        # For backwards compatibility with ISE paths, also
+        # look for a version in a subdirectory named "Vivado"
+        # under the current directory.
+        paths_to_try = [path, os.path.join(path, "Vivado")]
+        for p in paths_to_try:
+            try:
+                settings = common.settings(p, ver)
+            except OSError:
+                continue
+            break
+        else:
+            raise OSError("Unable to locate Vivado directory or settings.")
         vivado_cmd = "bash -c \"source " + settings + "&& vivado -mode tcl\""
     with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process:
         process.stdin.write(cmds.encode("ASCII"))