diff --git a/libXvMC.spec b/libXvMC.spec
index 1d12d11..833f7b2 100644
--- a/libXvMC.spec
+++ b/libXvMC.spec
@@ -1,18 +1,23 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.1
-Release: 2.2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Patch0: libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch
+
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXv-devel
 
+# FIXME: Remove when unneeded
+BuildRequires: autoconf, automake17
+
 Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
@@ -33,11 +38,14 @@ X.Org X11 libXvMC development package
 
 %prep
 %setup -q
+%patch0 -p0 -b .libXvMC-XConfigDir-fix-bug180902
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
+automake-1.7
+autoconf
 
 %configure \
 %if ! %{with_static}
@@ -62,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXvMC.so.1
 %{_libdir}/libXvMC.so.1.0.0
 %{_libdir}/libXvMCW.so.1
@@ -75,16 +82,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XvMClib.h
 %if %{with_static}
 %{_libdir}/libXvMC.a
-%endif
-%{_libdir}/libXvMC.so
-%if %{with_static}
 %{_libdir}/libXvMCW.a
 %endif
+%{_libdir}/libXvMC.so
 %{_libdir}/libXvMCW.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Tue Feb 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
+- Added libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch to fix (#180902)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-2.2
 - bump again for double-long bug on ppc(64)