diff --git a/Mesa.changes b/Mesa.changes
index c788228..e6583f3 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Dec 20 05:03:08 UTC 2015 - jimmy@boombatower.com
+
+- Apply patch: st/va: hardlink driver instances to
+  gallium_drv_video.so
+  + u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
+
 -------------------------------------------------------------------
 Thu Dec 17 07:06:21 UTC 2015 - jimmy@boombatower.com
 
diff --git a/Mesa.spec b/Mesa.spec
index d070bb6..11fb451 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -63,6 +63,8 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
+# to be upstreamed
+Patch17:        u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -552,6 +554,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch11 -p1
 #%patch15 -p1
 #%patch13 -p1
+%patch17 -p1
 
 %build
 %if 0%{?suse_version} >= 1310
@@ -938,6 +941,6 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %files libva
 %defattr(-,root,root)
 %dir %{_libdir}/dri
-%{_libdir}/dri/gallium_drv_video.so
+%{_libdir}/dri/*_drv_video.so
 
 %changelog
diff --git a/u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch b/u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
new file mode 100644
index 0000000..6330cfb
--- /dev/null
+++ b/u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
@@ -0,0 +1,38 @@
+From 8974248c4147e57552dc21c6d16e4d1817d34fad Mon Sep 17 00:00:00 2001
+From: Jimmy Berry <jimmy@boombatower.com>
+Date: Sat, 19 Dec 2015 22:49:10 -0600
+Subject: [Mesa-dev] [PATCH] st/va: hardlink driver instances to gallium_drv_video.so
+
+Removes the need to set LIBVA_DRIVER_NAME=gallium for supported targets and is
+consistent with vdpau and general gallium drivers.
+
+Signed-off-by: Jimmy Berry <jimmy@boombatower.com>
+---
+ src/gallium/targets/va/Makefile.am | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am
+index 733e7ac..2cab898 100644
+--- a/src/gallium/targets/va/Makefile.am
++++ b/src/gallium/targets/va/Makefile.am
+@@ -64,3 +64,17 @@ if HAVE_MESA_LLVM
+ gallium_drv_video_la_LIBADD += $(LLVM_LIBS)
+ gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS)
+ endif
++
++# hardlink each megadriver instance, but don't actually have
++# gallium_drv_video.so in the set of final installed files.
++install-data-hook:
++	for i in $(TARGET_DRIVERS); do                                  \
++		ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so                \
++		      $(DESTDIR)$(vadir)/$${i}_drv_video.so;                 \
++	done;                                                           \
++	$(RM) $(DESTDIR)$(vadir)/gallium_drv_video.*
++
++uninstall-hook:
++	for i in $(TARGET_DRIVERS); do                                  \
++		$(RM) $(DESTDIR)$(vadir)/$${i}_drv_video.so;                 \
++	done;
+-- 
+2.6.3
+