diff --git a/alex.changes b/alex.changes
index 707d849..3b89a23 100644
--- a/alex.changes
+++ b/alex.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul 18 14:26:08 UTC 2018 - psimons@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+  and update copyright headers with spec-cleaner.
+
+-------------------------------------------------------------------
+Tue Jun  5 16:50:43 UTC 2018 - psimons@suse.com
+
+- Run the test suite by default.
+- Build and install the man page and the documentation.
+
 -------------------------------------------------------------------
 Mon May 14 17:02:11 UTC 2018 - psimons@suse.com
 
@@ -76,13 +88,13 @@ Fri Apr 10 13:35:55 UTC 2015 - mimi.vx@gmail.com
 Mon Sep  8 20:08:49 UTC 2014 - peter.trommler@ohm-hochschule.de
 
 - update to 3.1.3
-* fix ghc 7.8 builds 
+* fix ghc 7.8 builds
 * needed by Haskell Platform 2014.2.0.0
 
 -------------------------------------------------------------------
 Tue Sep  2 01:17:20 UTC 2014 - peter.trommler@ohm-hochschule.de
 
-- package examples 
+- package examples
 - cleanup spec file
 
 -------------------------------------------------------------------
@@ -95,18 +107,18 @@ Tue May  7 14:03:17 UTC 2013 - peter.trommler@ohm-hochschule.de
 
 - update to 3.0.5 from upstream
 * performance improvement with certain grammars ~30%
-- part of Haskell Platform 2013.2 
+- part of Haskell Platform 2013.2
 
 -------------------------------------------------------------------
 Sat Nov 17 13:46:06 UTC 2012 - peter.trommler@ohm-hochschule.de
 
-- service localonly for Factory submission 
+- service localonly for Factory submission
 
 -------------------------------------------------------------------
 Mon Oct  1 19:01:07 UTC 2012 - peter.trommler@ohm-hochschule.de
 
 - update to 3.0.2 from upstream
-- needed by Haskell Platform 2012.4.0.0 
+- needed by Haskell Platform 2012.4.0.0
 
 -------------------------------------------------------------------
 Mon Jun  4 06:59:04 UTC 2012 - peter.trommler@ohm-hochschule.de
@@ -136,44 +148,43 @@ Mon Jun  4 06:59:04 UTC 2012 - peter.trommler@ohm-hochschule.de
     * Alex now does DFA minimization, which helps to reduce the size
       of the generated tables, especially for lexers that use Unicode.
 - dropped patch alex-2.3.5-generate-man-page.patch
-- required by Haskell Platform 2012.2.0.0 
+- required by Haskell Platform 2012.2.0.0
 
 -------------------------------------------------------------------
 Mon May  7 18:40:00 UTC 2012 - peter.trommler@ohm-hochschule.de
 
 - add patch to enable man page generation
-- generate, install and package man page alex.1 
+- generate, install and package man page alex.1
 
 -------------------------------------------------------------------
 Thu Dec 29 11:47:39 UTC 2011 - peter.trommler@ohm-hochschule.de
 
 - Clean up install section
-- Add three word to description to make rpmlint happier 
+- Add three word to description to make rpmlint happier
 
 -------------------------------------------------------------------
 Wed Dec 28 20:47:31 UTC 2011 - peter.trommler@ohm-hochschule.de
 
-- Adjusted version for platform 2011.4 
+- Adjusted version for platform 2011.4
 
 -------------------------------------------------------------------
 Sat Dec 10 16:48:35 UTC 2011 - peter.trommler@ohm-hochschule.de
 
 - Added /usr/share/alex-3.0.1 files
 - Fixed file owner
-- Deleted additional LICENSE file 
+- Deleted additional LICENSE file
 
 -------------------------------------------------------------------
 Mon Dec  5 09:04:47 UTC 2011 - peter.trommler@ohm-hochschule.de
 
-- Added QuickCheck BR 
+- Added QuickCheck BR
 
 -------------------------------------------------------------------
 Sat Nov 19 21:44:36 UTC 2011 - peter.trommler@ohm-hochschule.de
 
-- enabled i586 build 
+- enabled i586 build
 
 -------------------------------------------------------------------
 Tue Oct 11 19:50:28 UTC 2011 - peter.trommler@ohm-hochschule.de
 
-- created new package 
-
+- created new package
diff --git a/alex.spec b/alex.spec
index 3943d81..f2c2c58 100644
--- a/alex.spec
+++ b/alex.spec
@@ -16,7 +16,7 @@
 #
 
 
-%bcond_with tests
+%bcond_without tests
 Name:           alex
 Version:        3.2.4
 Release:        0
@@ -25,6 +25,7 @@ License:        BSD-3-Clause
 Group:          Development/Libraries/Haskell
 URL:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+BuildRequires:  autoconf
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-array-devel
 BuildRequires:  ghc-containers-devel
@@ -45,9 +46,16 @@ lex or flex for C/C++.
 
 %build
 %ghc_bin_build
+cd doc
+test -f configure || autoreconf
+# FIXME: you should use the %%configure macro
+./configure
 
 %install
 %ghc_bin_install
+mkdir -p %{buildroot}/%{_mandir}/man1
+cp doc/alex.1 %{buildroot}/%{_mandir}/man1
+rm doc/autom4te.cache/requests # varies across builds, breaking build-compare
 
 %check
 # Ensure that the test suite can find the alex binary.
@@ -64,6 +72,8 @@ export PATH="%{buildroot}%{_bindir}:$PATH"
 %{_datadir}/%{name}-%{version}/AlexTemplate-ghc
 %{_datadir}/%{name}-%{version}/AlexTemplate-ghc-debug
 %{_datadir}/%{name}-%{version}/AlexTemplate-ghc-nopred
+%{_datadir}/%{name}-%{version}
+%{_mandir}/man1/*
 %{_datadir}/%{name}-%{version}/AlexWrapper-basic
 %{_datadir}/%{name}-%{version}/AlexWrapper-basic-bytestring
 %{_datadir}/%{name}-%{version}/AlexWrapper-gscan