diff --git a/milkymist/asmicon/bankmachine.py b/milkymist/asmicon/bankmachine.py
index de472919a..07244e97e 100644
--- a/milkymist/asmicon/bankmachine.py
+++ b/milkymist/asmicon/bankmachine.py
@@ -1,8 +1,8 @@
 from migen.fhdl.structure import *
 from migen.bus.asmibus import *
-from migen.corelogic.roundrobin import *
-from migen.corelogic.fsm import FSM
-from migen.corelogic.misc import optree
+from migen.genlib.roundrobin import *
+from migen.genlib.fsm import FSM
+from migen.genlib.misc import optree
 
 from milkymist.asmicon.multiplexer import *
 
diff --git a/milkymist/asmicon/multiplexer.py b/milkymist/asmicon/multiplexer.py
index 6258e6b00..0f257841c 100644
--- a/milkymist/asmicon/multiplexer.py
+++ b/milkymist/asmicon/multiplexer.py
@@ -1,7 +1,7 @@
 from migen.fhdl.structure import *
-from migen.corelogic.roundrobin import *
-from migen.corelogic.misc import optree
-from migen.corelogic.fsm import FSM
+from migen.genlib.roundrobin import *
+from migen.genlib.misc import optree
+from migen.genlib.fsm import FSM
 
 class CommandRequest:
 	def __init__(self, a, ba):
diff --git a/milkymist/asmicon/refresher.py b/milkymist/asmicon/refresher.py
index 463f673aa..641bb2321 100644
--- a/milkymist/asmicon/refresher.py
+++ b/milkymist/asmicon/refresher.py
@@ -1,6 +1,6 @@
 from migen.fhdl.structure import *
-from migen.corelogic.misc import timeline
-from migen.corelogic.fsm import FSM
+from migen.genlib.misc import timeline
+from migen.genlib.fsm import FSM
 
 from milkymist.asmicon.multiplexer import *
 
diff --git a/milkymist/norflash/__init__.py b/milkymist/norflash/__init__.py
index 76b0a61c3..e8e97f312 100644
--- a/milkymist/norflash/__init__.py
+++ b/milkymist/norflash/__init__.py
@@ -1,6 +1,6 @@
 from migen.fhdl.structure import *
 from migen.bus import wishbone
-from migen.corelogic.misc import timeline
+from migen.genlib.misc import timeline
 
 class NorFlash:
 	def __init__(self, adr_width, rd_timing):