diff --git a/ImageMagick.changes b/ImageMagick.changes
index a03c998..9f2961e 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  9 15:03:34 UTC 2010 - prusnak@suse.cz
+
+- build -doc subpackage as noarch
+- spec cleanup
+
 -------------------------------------------------------------------
 Mon Jan 11 15:13:29 CET 2010 - pgajdos@suse.cz
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index bb8ac3e..a62ac33 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -26,13 +26,11 @@ BuildRequires:  fdupes libdjvulibre-devel libexif-devel libjasper-devel
 Obsoletes:      imagemag
 Provides:       imagemag
 %define xtp_version 5.4.3
-%define prefix /usr
-%define perl_prefix /usr
 License:        PERMISSIVE-OSI-COMPLIANT
 Group:          Productivity/Graphics/Other
 AutoReqProv:    on
 Version:        6.5.8.9
-Release:        1
+Release:        2
 %define source_version 6.5.8-9
 Summary:        Viewer and Converter for Images
 Url:            http://www.imagemagick.org
@@ -103,6 +101,9 @@ License:        PERMISSIVE-OSI-COMPLIANT
 Summary:        Document Files for ImageMagick Library
 Group:          Development/Libraries/C and C++
 Requires:       ImageMagick = %{version}
+%if 0%{?suse_version} >= 1120
+BuildArch:      noarch
+%endif
 
 %prep
 rm -rf xtp-%{xtp_version}
@@ -113,7 +114,7 @@ rm -rf xtp-%{xtp_version}
 %build
 %define system_ltdl 0
 %if %system_ltdl
-cp -f /usr/share/libtool/libltdl/*.{c,h} ltdl
+cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl
 mv ltdl/ltdl.c ltdl/ltdl.c.orig
 sed -e "s:<config.h>:<magick/magick-config.h>:" ltdl/ltdl.c.orig >ltdl/ltdl.c
 %endif
@@ -128,20 +129,26 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
   OPENMP="--disable-openmp"
 %endif
 export LDFLAGS="-L%{_libdir}"
-./configure --prefix=%{prefix} --libdir=%{_libdir} \
-         --mandir=%{_mandir} --enable-shared --without-frozenpaths \
-	 --with-largefiles  --with-magick_plus_plus --with-modules\
-	 --with-threads --without-perl --disable-static  \
-	 --enable-libtool-verbose --with-djvu=yes $OPENMP
+%configure \
+  --enable-shared \
+  --without-frozenpaths \
+  --with-largefiles \
+  --with-magick_plus_plus \
+  --with-modules \
+  --with-threads \
+  --without-perl \
+  --disable-static \
+  --enable-libtool-verbose \
+  --with-djvu=yes $OPENMP
 make %{?jobs:-j%jobs} all
 cd PerlMagick
 perl Makefile.PL
-make %{?jobs:-j%jobs} LD_RUN_PATH="/usr/%{_lib}:/usr/X11R6/%{_lib}"
+make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}"
 #
 cd ../../xtp-%{xtp_version}
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-./configure --prefix=%{prefix} --libdir=%{_libdir} --mandir=%{_mandir} 
+%configure
 make %{?jobs:-j%jobs}
 
 %check
@@ -153,16 +160,14 @@ cd PerlMagick
 make test
 
 %install
-install -d $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images
+install -d $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/images
 make install \
      DESTDIR=$RPM_BUILD_ROOT \
      pkgdocdir=%{_defaultdocdir}/%{name}/
-install -m 644 ChangeLog \
-        QuickStart.txt README.txt \
-	$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
+install -m 644 ChangeLog QuickStart.txt README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
 cd PerlMagick
-make DESTDIR=$RPM_BUILD_ROOT LD_RUN_PATH="/usr/%{_lib}:/usr/X11R6/%{_lib}" install_vendor
-%perl_process_packlist     
+make DESTDIR=$RPM_BUILD_ROOT LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" install_vendor
+%perl_process_packlist
 cd ../Magick++
   rm -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} `find demo -type f -perm +111`
   mv demo/makefile.2 demo/Makefile
@@ -170,16 +175,16 @@ cd ..
 pushd ../xtp-%{xtp_version}
   make DESTDIR=$RPM_BUILD_ROOT install 
 popd
-mv -f $RPM_BUILD_ROOT/usr/share/ImageMagick*/config/* $RPM_BUILD_ROOT/%{_libdir}/ImageMagick*/config
-rmdir $RPM_BUILD_ROOT/usr/share/ImageMagick*/config
-mv -f $RPM_BUILD_ROOT/usr/share/ImageMagick*/* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
-cp -a scenes $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
-find $RPM_BUILD_ROOT/%{_libdir} -name "*.la" -print0 | xargs -0 -r perl -spi -e "s@ -L/usr/src[^ ]*@@g;s@ /usr/lib/libltdl.la@@g" 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libltdl.*
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config/* $RPM_BUILD_ROOT%{_libdir}/ImageMagick*/config
+rmdir $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config
+mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
+cp -a scenes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
+rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick*/modules*/*/*.la
 %if 0%{?suse_version} > 1020
-%fdupes $RPM_BUILD_ROOT/usr/include/ImageMagick/wand
-%fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/ImageMagick/www/api
+%fdupes $RPM_BUILD_ROOT%{_includedir}/ImageMagick/wand
+%fdupes $RPM_BUILD_ROOT%{_datadir}/doc/packages/ImageMagick/www/api
 %endif
 
 %clean
@@ -203,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/%{name}/*.txt
 %{_docdir}/%{name}/ChangeLog
 %{_docdir}/%{name}/LICENSE
-%{prefix}/bin/[^MW]*
+%{_bindir}/[^MW]*
 %doc %{_mandir}/man1/*
 
 %files -n libMagickCore2
@@ -218,7 +223,6 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.*
 %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.*
 %{_libdir}/ImageMagick*/modules*/*/*.so
-%{_libdir}/ImageMagick*/modules*/*/*.la
 
 %files -n libMagickWand2
 %defattr(-,root,root)
@@ -227,23 +231,20 @@ rm -rf $RPM_BUILD_ROOT
 %files extra
 %defattr(-,root,root)
 %{_libdir}/ImageMagick*/modules*/*/wmf.so
-%{_libdir}/ImageMagick*/modules*/*/wmf.la
 %{_libdir}/ImageMagick*/modules*/*/jp2.so
-%{_libdir}/ImageMagick*/modules*/*/jp2.la
 %{_libdir}/ImageMagick*/modules*/*/djvu.so
-%{_libdir}/ImageMagick*/modules*/*/djvu.la
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libMagickCore.so
 %{_libdir}/libMagickWand.so
-%dir %{prefix}/include/ImageMagick
-%{prefix}/include/ImageMagick/magick
-%{prefix}/include/ImageMagick/wand
-%{prefix}/bin/MagickCore-config
-%{prefix}/bin/MagickWand-config
-%{prefix}/bin/Magick-config
-%{prefix}/bin/Wand-config
+%dir %{_includedir}/ImageMagick
+%{_includedir}/ImageMagick/magick
+%{_includedir}/ImageMagick/wand
+%{_bindir}/MagickCore-config
+%{_bindir}/MagickWand-config
+%{_bindir}/Magick-config
+%{_bindir}/Wand-config
 %{_libdir}/pkgconfig/ImageMagick.pc
 %{_libdir}/pkgconfig/Wand.pc
 %{_libdir}/pkgconfig/MagickCore.pc
@@ -267,9 +268,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Magick++/demo
 %doc Magick++/NEWS Magick++/README Magick++/AUTHORS
 %{_libdir}/libMagick++.so
-%{prefix}/include/ImageMagick/Magick++.h
-%{prefix}/include/ImageMagick/Magick++
-%{prefix}/bin/Magick++-config
+%{_includedir}/ImageMagick/Magick++.h
+%{_includedir}/ImageMagick/Magick++
+%{_bindir}/Magick++-config
 %{_libdir}/pkgconfig/ImageMagick++.pc
 %{_libdir}/pkgconfig/Magick++.pc