diff --git a/htmldoc.changes b/htmldoc.changes
index 39aa6c0..e9706df 100644
--- a/htmldoc.changes
+++ b/htmldoc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  2 17:46:20 UTC 2016 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Use macro for configure
+
 -------------------------------------------------------------------
 Wed Feb 25 19:49:30 UTC 2015 - benoit.monin@gmx.fr
 
diff --git a/htmldoc.spec b/htmldoc.spec
index 9a02352..e2e954b 100644
--- a/htmldoc.spec
+++ b/htmldoc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package htmldoc
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,26 @@
 
 
 Name:           htmldoc
-BuildRequires:  autoconf
-BuildRequires:  fltk-devel
-BuildRequires:  freeglut-devel
-BuildRequires:  gcc-c++
-BuildRequires:  libdrm-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libpng-devel
-BuildRequires:  openssl-devel
-Url:            http://htmldoc.org/
 Version:        1.8.28
 Release:        0
 Summary:        HTML Processor that Generates HTML, PostScript, and PDF Files
 License:        LGPL-2.1+
 Group:          Productivity/Publishing/HTML/Tools
+Url:            http://htmldoc.org/
 Source:         http://www.msweet.org/files/project1/%{name}-%{version}-source.tar.bz2
-Patch:          %{name}-docpath.diff
+Patch0:         %{name}-docpath.diff
 # PATCH-FIX-UPSTREAM htmldoc-cups_rand.patch upstream bug #510
 Patch1:         htmldoc-cups_rand.patch
+BuildRequires:  autoconf
+BuildRequires:  fltk-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libXpm-devel
+BuildRequires:  libdrm-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  openssl-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define       DOCDIR %{_datadir}/doc/packages/%{name}
 
 %description
 HTMLDOC converts HTML source files into indexed HTML, PostScript, or
@@ -45,33 +45,30 @@ printed.
 
 %prep
 %setup -q
-%patch
+%patch0
 %patch1 -p1
 
 %build
-export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
 autoconf
-./configure \
-	--bindir=%{_bindir} \
-	--prefix=%{_usr} \
-	--mandir=%{_mandir} \
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%configure \
 	--with-gui
-make
+make %{?_smp_mflags} V=1
 
 %install
-[ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}"
 make \
-	bindir=${RPM_BUILD_ROOT}/%{_bindir} \
-	prefix=${RPM_BUILD_ROOT}/%{_usr} \
-	mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-	datadir=${RPM_BUILD_ROOT}/%{_datadir} \
+  %{?_smp_mflags} \
+	bindir=%{buildroot}/%{_bindir} \
+	prefix=%{buildroot}/%{_usr} \
+	mandir=%{buildroot}/%{_mandir} \
+	datadir=%{buildroot}/%{_datadir} \
 install
 
-%files 
+%files
 %defattr(-,root,root)
+%doc cgi-bin/ CHANGES.txt COPYING.txt README.txt
 %{_bindir}/htmldoc
 %{_datadir}/htmldoc
-%doc %{_mandir}/man1/htmldoc.1.gz
-%doc cgi-bin/ CHANGES.txt COPYING.txt README.txt
+%{_mandir}/man1/htmldoc.1%{ext_man}
 
 %changelog