diff --git a/Makefile b/Makefile
index 2e680f0da0..7e831ded3c 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,8 @@ endif
 
 ifeq ($(HAVE_XVIDEO), 1)
    OBJ += gfx/xvideo.o input/x11_input.o
-   LIBS += -lX11 -lXext -lXv
+   LIBS += $(XVIDEO_LIBS)
+   DEFINES += $(XVIDEO_CFLAGS)
 endif
 
 ifeq ($(HAVE_CG), 1)
diff --git a/config.features.h b/config.features.h
index 6ee4111eef..86562f98ab 100644
--- a/config.features.h
+++ b/config.features.h
@@ -14,6 +14,12 @@ static const bool _sdl_supp = true;
 static const bool _sdl_supp = false;
 #endif
 
+#ifdef HAVE_XVIDEO
+static const bool _xvideo_supp = true;
+#else
+static const bool _xvideo_supp = false;
+#endif
+
 #ifdef HAVE_ALSA
 static const bool _alsa_supp = true;
 #else
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index d0810c59b8..17a3a20909 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -67,7 +67,7 @@ check_pkgconf SRC samplerate
 check_lib DYNAMIC $DYLIB dlopen
 
 check_pkgconf FREETYPE freetype2
-check_lib XVIDEO -lXv XvShmCreateImage
+check_pkgconf XVIDEO xv
 
 check_lib STRL -lc strlcpy
 
diff --git a/ssnes.c b/ssnes.c
index 8ae6b58ef1..79d89f1561 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -351,6 +351,7 @@ static void print_features(void)
    puts("");
    puts("Features:");
    _PSUPP(sdl, "SDL", "SDL drivers");
+   _PSUPP(xvideo, "XVideo", "XVideo output");
    _PSUPP(alsa, "ALSA", "audio driver");
    _PSUPP(oss, "OSS", "audio driver");
    _PSUPP(jack, "Jack", "audio driver");