diff --git a/libreoffice.changes b/libreoffice.changes
index d50a99b..cf0a2eb 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan  7 15:24:15 UTC 2014 - tchvatal@suse.com
+
+- Sort out some whitespace and ordering with spec-cleaner.
+
 -------------------------------------------------------------------
 Tue Jan  7 15:17:27 UTC 2014 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 6271148..27b1d7d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -52,6 +52,11 @@ Source402:      %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
 # used extensions sources
 Source450:      %{external_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-%{ct2n_version}.oxt
 Source452:      %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+# unused extensions sources
+# FIXME: this is just because of license; we do not build gdocs from sources now
+# gdocs sources
+Source500:      gdocs_3.0.0.tar.bz2
+Source501:      gdocs_3.0.0.diff
 # Internal bundled stuff (jfreereport), should be unbundled
 Source1000:     %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 Source1001:     %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
@@ -76,11 +81,6 @@ Source2003:     %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source2004:     %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 # Needed for wiki-published and always taken as bundled
 Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-# unused extensions sources
-# FIXME: this is just because of license; we do not build gdocs from sources now
-# gdocs sources
-Source500:      gdocs_3.0.0.tar.bz2
-Source501:      gdocs_3.0.0.diff
 # PATCH-FIX-UPSTREAM: search usr and lib together for the icons, after last update it only
 #                     takes one path, so our patch won't work at all
 Patch2:         split-icons-search-usr-share.diff
@@ -790,8 +790,8 @@ tar -xjf %{SOURCE20}
 
 %build
 # Parallel build settings ...
-lo_jobs="%{?jobs:%jobs}"
-%ifarch %arm
+lo_jobs="%{?jobs:%{jobs}}"
+%ifarch %{arm}
 %if ! 0%{?qemu_user_space_build:1}
 # native hardware is not that powerful
 lo_jobs="1"
@@ -803,7 +803,7 @@ free
 echo "System limits:"
 ulimit -a
 lo_jobs_reduced=
-if test -e "/usr/lib/icecc/bin/gcc" -a -e "/usr/lib/icecc/bin/g++" ; then
+if test -e "%{_libexecdir}/icecc/bin/gcc" -a -e "%{_libexecdir}/icecc/bin/g++" ; then
     PARALLEL_BUILD="$PARALLEL_BUILD --enable-icecream"
 else
     if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
@@ -828,14 +828,14 @@ if test -n "$lo_jobs" ; then
 fi
 # using icecream
 # make sure that JAVA_HOME is set correctly
-source /etc/profile.d/alljava.sh
+source %{_sysconfdir}/profile.d/alljava.sh
 # use RPM_OPT_FLAGS, ...
 # FIXME: use -g1 instead of -g; the .o files need about 12GB disk space with full debugging symbols; there is not enough disk space and not enough memory for linking libmerged on the build hosts
 # 12.3 has broken cppconnector with wrong incude paths
 %if 0%{?suse_version} == 01230
-ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing -I/usr/include/mysql-connector/ "
+ARCH_FLAGS="`echo %{optflags} | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing -I%{_includedir}/mysql-connector/ "
 %else
-ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing"
+ARCH_FLAGS="`echo %{optflags} | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing"
 %endif
 CFLAGS="$ARCH_FLAGS"
 CXXFLAGS="$ARCH_FLAGS"
@@ -938,11 +938,11 @@ builddir=`pwd`
 cd %{buildroot}%{_datadir}/applications
 for desktop in * ; do
     # relative link is needed by %%suse_update_desktop_file
-    relative_target=`readlink $desktop | sed "s|%{_libdir}|../../%_lib|"`
-    # FIXME: remove the libreoffice- prefix because the old desktop files are preferred in /etc/gnome_defaults.conf
-    desktop_new=`echo $desktop | sed -e "s/%name-//"`
+    relative_target=`readlink $desktop | sed "s|%{_libdir}|../../%{_lib}|"`
+    # FIXME: remove the libreoffice- prefix because the old desktop files are preferred in %{_sysconfdir}/gnome_defaults.conf
+    desktop_new=`echo $desktop | sed -e "s/%{name}-//"`
     rm $desktop
-    sed -i -e "s|%_datadir/applications/$desktop|%_datadir/applications/$desktop_new|" $builddir/file-lists/*.txt
+    sed -i -e "s|%{_datadir}/applications/$desktop|%{_datadir}/applications/$desktop_new|" $builddir/file-lists/*.txt
     # finally, create the right link
     ln -sf $relative_target $desktop_new
     # enable startup notification (bnc#796875)
@@ -952,7 +952,7 @@ for desktop in * ; do
     %suse_update_desktop_file $app
 done
 # FIXED: 4.3 branch
-sed -i -e 's:Office;:Office;Spreadsheet;:g' %{buildroot}/%_datadir/applications/math.desktop
+sed -i -e 's:Office;:Office;Spreadsheet;:g' %{buildroot}/%{_datadir}/applications/math.desktop
 cd -
 ################
 # compat stuff for noarch packages