diff --git a/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch b/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
deleted file mode 100644
index ceaf43f..0000000
--- a/libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git ./configure.ac ./configure.ac
-index fc28ef9..63ef0c8 100644
---- ./configure.ac
-+++ ./configure.ac
-@@ -37,7 +37,7 @@ AC_PROG_CC
- AC_PROG_LIBTOOL
- XORG_CWARNFLAGS
- 
--encodingsdir=${libdir}/X11/fonts/encodings
-+encodingsdir=$(pkg-config --variable=fontdir fontutil)/encodings
- AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
- 	[Path to font encodings]), [encodingsdir="$withval"])
- ENCODINGSDIR="$encodingsdir"
diff --git a/libfontenc.spec b/libfontenc.spec
index 3082665..937b03b 100644
--- a/libfontenc.spec
+++ b/libfontenc.spec
@@ -1,20 +1,17 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
-Version: 1.0.5
-Release: 4%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: ftp://ftp.x.org/pub/individual/lib/%{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
 BuildRequires: xorg-x11-font-utils
-# FIXME: temporarily require autoconf for workaround
-BuildRequires: autoconf
 
 %description
 X.Org X11 libfontenc runtime library
@@ -29,17 +26,10 @@ X.Org X11 libfontenc development package
 
 %prep
 %setup -q
-%patch0 -p0 -b .get-fontdir-from-pkgconfig
-
-# Disable static library creation by default.
-%define with_static 0
 
 %build
-autoconf
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+export CFLAGS="$RPM_OPT_FLAGS -Os"
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -60,13 +50,13 @@ find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/X11/fonts/fontenc.h
-%if %{with_static}
-%{_libdir}/libfontenc.a
-%endif
 %{_libdir}/libfontenc.so
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Tue Jun 21 2011 Adam Jackson <ajax@redhat.com> 1.1.0-1
+- libfontenc 1.1.0
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild