diff --git a/libva.spec b/libva.spec
index 6f4bf46..0d2e9d7 100644
--- a/libva.spec
+++ b/libva.spec
@@ -9,10 +9,14 @@ URL:		https://github.com/intel/libva
 Source0:	%{url}/archive/%{version}%{?pre_release}/%{name}-%{version}%{?pre_release}.tar.gz
 
 BuildRequires:	libtool
+BuildRequires:  make
+BuildRequires:  gcc
 
 BuildRequires:	libudev-devel
+%{!?_without_xorg:
 BuildRequires:	libXext-devel
 BuildRequires:	libXfixes-devel
+}
 BuildRequires:	libdrm-devel
 BuildRequires:	libpciaccess-devel
 BuildRequires:	mesa-libEGL-devel
@@ -22,10 +26,9 @@ BuildRequires:	mesa-libGLES-devel
 BuildRequires:  wayland-devel
 BuildRequires:  pkgconfig(wayland-client) >= 1
 BuildRequires:  pkgconfig(wayland-scanner) >= 1
-BuildRequires: make
 }
 # owns the %%{_libdir}/dri directory
-Requires:	mesa-dri-filesystem
+Requires:	mesa-filesystem%{_isa}
 
 %description
 Libva is a library providing the VA API video acceleration API.
@@ -33,7 +36,6 @@ Libva is a library providing the VA API video acceleration API.
 %package	devel
 Summary:	Development files for %{name}
 Requires:	%{name}%{_isa} = %{version}-%{release}
-Requires:	pkgconfig
 
 %description	devel
 The %{name}-devel package contains libraries and header files for
@@ -46,7 +48,7 @@ autoreconf -vif
 
 %build
 %configure --disable-static \
-  --enable-glx \
+%{?_without_xorg: --disable-glx --disable-x11} \
 %{?_without_wayland:--disable-wayland}
 
 # remove rpath from libtool
@@ -56,7 +58,7 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %make_build
 
 %install
-%make_install INSTALL="install -p"
+%make_install
 find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 
 %ldconfig_scriptlets
@@ -65,7 +67,15 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 %doc NEWS
 %license COPYING
 %ghost %{_sysconfdir}/libva.conf
-%{_libdir}/libva*.so.*
+%{_libdir}/libva.so.2*
+%{_libdir}/libva-drm.so.2*
+%{!?_without_wayland:
+%{_libdir}/libva-wayland.so.2*
+}
+%{!?_without_xorg:
+%{_libdir}/libva-x11.so.2*
+%{_libdir}/libva-glx.so.2*
+}
 
 %files devel
 %{_includedir}/va