diff --git a/litex/__init__.py b/litex/__init__.py
index 19eec2b36..e1534fda3 100644
--- a/litex/__init__.py
+++ b/litex/__init__.py
@@ -1 +1,6 @@
-from litex.tools.litex_client import RemoteClient
\ No newline at end of file
+import sys
+from litex.tools.litex_client import RemoteClient
+
+# retro-compat 2019-09-29
+from litex.soc.integration import export
+sys.modules["litex.soc.integration.cpu_interface"] = export
\ No newline at end of file
diff --git a/litex/soc/integration/__init__.py b/litex/soc/integration/__init__.py
index 1c9d9b4b8..8a97adbde 100644
--- a/litex/soc/integration/__init__.py
+++ b/litex/soc/integration/__init__.py
@@ -1,6 +1,2 @@
-
 from litex.soc.integration.soc_core import SoCCore
 from litex.soc.integration.soc_sdram import SoCSDRAM
-
-# FIXME: retro-compat 2019-09-29
-from litex.soc.integration import export as cpu_interface