diff --git a/alex.spec b/alex.spec
index 970ab24..0cddb27 100644
--- a/alex.spec
+++ b/alex.spec
@@ -1,24 +1,18 @@
-%define with_ps_docs   0
-
 Name:          alex
 Summary:       The lexer generator for Haskell
-Summary(de):   Ein Lexer-Generator für Haskell
-Version:       2.0.1
+Summary(de):   Ein Lexer-Generator für Haskell
+Version:       2.1.0
 Release:       0
 License:       BSD w/o adv. clause
 Group:         Development/Languages/Haskell
 Packager:      Herbert Graeber <herbert@graeber-clan.de>
 URL:           http://www.haskell.org/alex/
-Source:        http://www.haskell.org/alex/dist/%{version}/alex-%{version}-src.tar.gz
+Source:        http://www.haskell.org/alex/dist/%{version}/alex-%{version}.tar.gz
 BuildRequires: ghc
 BuildRequires: libxslt
 BuildRequires: sgml-skel
 BuildRequires: docbook-xsl-stylesheets
 BuildRequires: docbook-utils
-%if %{with_ps_docs}
-BuildRequires: fop
-BuildRequires: xmltex
-%endif
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 Prefix:        /usr
 
@@ -49,21 +43,16 @@ Dieses ist Dokumentation f
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} \
+	--libexecdir=%{_prefix}/lib
+runhaskell Setup.lhs build
+cd doc
 test -f configure || autoreconf
-./configure --prefix=/usr --libdir=%{_libdir} \
-%ifarch x86_64 amd64 ia32e
-            --enable-libsuffix=64
-%endif
-
-make
+./configure
 make html
-%if %{with_ps_docs}
-make ps
-%endif
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} install
+runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
 
 %files
 %defattr (-,root,root)
@@ -73,7 +62,7 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%
 %doc alex/TODO
 %{prefix}/bin/alex
 %{prefix}/bin/alex-%{version}
-%{prefix}/%{_lib}/alex-%{version}
+%{_libdir}/alex-%{version}
 
 %files doc
 %defattr (-,root, root)
@@ -84,6 +73,9 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}-%
 %endif
 
 %changelog
+* Thu Jan 18 2007 Herbert Graeber <herbert@links2linux.de>
+- Update to version 2.1.0
+
 * Wed Sep 06 2006 Herbert Graeber <herbert@links2linux.de>
 - Haddock isn't needed for build