diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c
index 68ffa9ef3..0d095352f 100644
--- a/hw/kdrive/ephyr/ephyr_draw.c
+++ b/hw/kdrive/ephyr/ephyr_draw.c
@@ -513,6 +513,6 @@ exaDDXDriverInit(ScreenPtr pScreen)
 {
     ExaScreenPriv(pScreen);
 
-    pExaScr->migration = ExaMigrationAlways;
+    pExaScr->migration = ExaMigrationSmart;
     pExaScr->hideOffscreenPixmapData = TRUE;
 }
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 627bfd567..cc3a9d4f2 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -125,6 +125,8 @@ exaDDXDriverInit(ScreenPtr pScreen)
 		pExaScr->migration = ExaMigrationGreedy;
 	    else if (strcmp(heuristicName, "always") == 0)
 		pExaScr->migration = ExaMigrationAlways;
+	    else if (strcmp(heuristicName, "smart") == 0)
+		pExaScr->migration = ExaMigrationSmart;
 	    else {
 		xf86DrvMsg (pScreen->myNum, X_WARNING, 
 			    "EXA: unknown migration heuristic %s\n",