diff --git a/ghc.spec b/ghc.spec
index 47f0950..8cfd531 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -16,7 +16,7 @@
 
 Name:		ghc
 Version:	6.10.0.20081007
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
 ExcludeArch:	alpha ppc64
@@ -26,17 +26,13 @@ Source0:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
 Source1:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 Source2:	ghc-rpm-macros.ghc
 URL:		http://haskell.org/ghc/
-Requires:	gcc, gmp-devel, readline-devel
+Requires:	gcc, gmp-devel, libedit-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:      ghc682, ghc681, ghc661, ghc66
+Obsoletes:      ghc682, ghc681, ghc661, ghc66, haddock <= 2.0.0.0
 BuildRequires:  ghc, happy, sed
-BuildRequires:  gmp-devel, readline-devel
-# X11 is no longer in ghc extralibs
-#BuildRequires:  libX11-devel, libXt-devel
-BuildRequires:  freeglut-devel, openal-devel
+BuildRequires:  gmp-devel, libedit-devel
 %if %{build_doc}
-# haddock generates docs in libraries, but haddock 2.0 is not compatible
-BuildRequires: libxslt, docbook-style-xsl, haddock09
+BuildRequires: libxslt, docbook-style-xsl
 %endif
 
 %description
@@ -98,8 +94,6 @@ echo "XMLDocWays   = html" >> mk/build.mk
 echo "HADDOCK_DOCS = YES" >> mk/build.mk
 %endif
 
-export HaddockCmd=%{_bindir}/haddock-0.9
-
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
   --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
@@ -199,6 +193,11 @@ fi
 
 
 %changelog
+* Sun Oct 12 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-2.fc10
+- Use libedit in preference to readline, for BSD license consistency
+- With haddock bundled now, obsolete standalone versions (but not haddock09)
+- Drop obsolete freeglut-devel, openal-devel, and haddock09 dependencies
+
 * Sun Oct 12 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.10.0.20081007-1.fc10
 - Update to 6.10.1 release candidate 1