diff --git a/.cvsignore b/.cvsignore
index cedb0c0..bf9becd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libfontenc-0.99.3.tar.bz2
+libfontenc-1.0.0.tar.bz2
diff --git a/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch b/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
new file mode 100644
index 0000000..cebf1eb
--- /dev/null
+++ b/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
@@ -0,0 +1,11 @@
+--- ./configure.ac.get-fontdir-from-pkgconfig	2005-12-16 03:10:56.000000000 -0500
++++ ./configure.ac	2005-12-16 03:11:25.000000000 -0500
+@@ -35,7 +35,7 @@
+ 
+ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+ 
+-DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
++DEFAULT_ENCODINGSDIR=$(pkg-config --variable=fontdir fontutil)/encodings
+ AC_ARG_WITH(encodingsdir,
+ 	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]),
+ 	[ENCODINGSDIR="$withval"],
diff --git a/libfontenc.spec b/libfontenc.spec
index 0335060..18fca44 100644
--- a/libfontenc.spec
+++ b/libfontenc.spec
@@ -1,15 +1,17 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
-Version: 0.99.3
+Version: 1.0.0
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/release/X11R7.0-RC2/everything/%{name}-%{version}.tar.bz2
-Patch0: libfontenc-0.99.2-use-datadir-for-encodings.patch
+Source0: http://xorg.freedesktop.org/release/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
+Patch0: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
 
+BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
 
@@ -23,7 +25,6 @@ Summary: X.Org X11 libfontenc development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -32,7 +33,7 @@ X.Org X11 libfontenc development package
 
 %prep
 %setup -q
-%patch0 -p0 -b .use-datadir-for-encodings
+%patch0 -p0 -b .get-fontdir-from-pkgconfig
 
 # Disable static library creation by default.
 %define with_static 0
@@ -41,8 +42,8 @@ X.Org X11 libfontenc development package
 # FIXME: libfontenc-0.99.2-use-datadir-for-encodings.patch requires that
 # aclocal, automake, and autoconf get invoked to activate the changes.
 # These can be removed once the patch is no longer necessary.
-aclocal
-automake
+#aclocal
+#automake
 autoconf
 %configure \
 %if ! %{with_static}
@@ -83,6 +84,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Fri Dec 16 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
+- Updated libfontenc to version 1.0.0 from X11R7 RC4
+- Added libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch which now replaces
+  libfontenc-0.99.2-use-datadir-for-encodings.patch by using pkgconfig to
+  query fontutil.pc for fontdir.
+- Added "BuildRequires: font-utils >= 1.0.0" to find fontutil.pc
+- Removed libfontenc-0.99.2-use-datadir-for-encodings.patch
+
 * Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
 - Updated libfontenc to version 0.99.3 from X11R7 RC3
 - Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure
diff --git a/sources b/sources
index 9c369f6..e4a090d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ccb051962f067ec076dc12b0b43913d  libfontenc-0.99.3.tar.bz2
+c0eff6b88213629cb72ca9c4486900a4  libfontenc-1.0.0.tar.bz2