diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 7142c683d6..e61a77b8fc 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -307,7 +307,7 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
 #endif
 
     /* Fallback to platform default hardware */
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+#if defined(__i386__) || defined(__amd64__) || defined(__GNU__)
     xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
     xf86AddMatchedDriver(md, "sunffb");
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index db2253165c..631ae64772 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -148,6 +148,7 @@ else
         'stub/stub_bell.c',
         'stub/stub_init.c',
         'stub/stub_video.c',
+        'misc/SlowBcopy.c',
     ]
 endif