diff --git a/inkscape.changes b/inkscape.changes
index c6d81e2..f5d7679 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 22 18:01:04 CET 2007 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
 -------------------------------------------------------------------
 Thu Jan  4 12:46:30 CET 2007 - prusnak@suse.cz
 
diff --git a/inkscape.spec b/inkscape.spec
index f570d36..eeac65f 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -11,15 +11,14 @@
 # norootforbuild
 
 Name:           inkscape
-BuildRequires:  cairomm docbook-toys gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel mDNSResponder-devel perl-XML-Parser python-devel python-gtk-devel sgml-skel update-desktop-files
-%define prefix /opt/gnome
+BuildRequires:  cairomm docbook-toys gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel python-devel python-gtk-devel sgml-skel update-desktop-files
 License:        GNU General Public License (GPL)
 Group:          Productivity/Graphics/Vector Editors
 Requires:       cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit libwmf gzip skencil /usr/bin/gs
 Autoreqprov:    on
 Summary:        Inkscape Vector Illustration Program
 Version:        0.44.1
-Release:        35
+Release:        39
 Provides:       sodipodi
 Obsoletes:      sodipodi
 PreReq:         /bin/rm /bin/ln /bin/sh /usr/bin/perl
@@ -87,7 +86,7 @@ Authors:
     Masatake Yamato
 
 %prep
-%setup -b 1
+%setup -q -b 1
 %patch
 %patch4
 %patch6
@@ -108,43 +107,40 @@ EOF
 chmod -x README.ca.txt
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
 pushd ../gc*
-autoreconf --force --install
-export CFLAGS="$CFLAGS -fPIC -fno-strict-aliasing"
-export CXXFLAGS="$CFLAGS"
-./configure --prefix=/usr --disable-shared
-make
+autoreconf -f -i
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure\
+	--libdir=%{_prefix}/lib\
+	--disable-shared
+make %{?jobs:-j%jobs}
 make install DESTDIR=$RPM_BUILD_DIR/gc_install
+unset CFLAGS
 popd
-aclocal
-automake
-autoconf
-./configure --prefix=%prefix \
-	    --mandir=%_mandir \
-	    --libdir=%prefix/%_lib \
-	    --datadir=%prefix/share \
-	    --enable-db2html \
-	    --enable-gnome \
-	    --with-python \
-	    --with-perl \
-	    --with-gnome-print \
-	    --enable-inkboard \
-            --with-gc=$RPM_BUILD_DIR/gc_install/usr
+autoreconf -f -i
+export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure\
+	--enable-db2html\
+	--enable-gnome\
+	--with-python\
+	--with-perl\
+	--with-gnome-print\
+	--enable-inkboard\
+	--with-gc=$RPM_BUILD_DIR/gc_install/usr
 make %{?jobs:-j%jobs}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 %suse_update_desktop_file -N "Inkscape" -G "SVG Vector Illustrator" inkscape Office FlowChart
 %find_lang %{name}
-mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/inkscape/extensions-optional
-cp $RPM_BUILD_ROOT/opt/gnome/share/inkscape/extensions/dia.inx $RPM_BUILD_ROOT/opt/gnome/share/inkscape/extensions-optional
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions-optional
+cp $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions/dia.inx $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions-optional
 
 %triggerin -- dia
 ln -f opt/gnome/share/inkscape/extensions-optional/dia.inx opt/gnome/share/inkscape/extensions/dia.inx
 
 %triggerpostun -- dia
-if [ ! -x /opt/gnome/bin/dia ] ; then
+if [ ! -x %{_bindir}/dia ] ; then
   rm opt/gnome/share/inkscape/extensions/dia.inx
 fi
 
@@ -154,25 +150,26 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog HACKING* INSTALL NEWS README* TRANSLATORS
-/opt/gnome/bin/*
-/opt/gnome/share/applications/inkscape.desktop
-%doc /usr/share/man/man?/*.*
-%doc /usr/share/man/??/man?/*.*
-%dir /opt/gnome/share/inkscape
-/opt/gnome/share/inkscape/[a-df-z]*
-/opt/gnome/share/inkscape/exa*
-/opt/gnome/share/inkscape/extensions-optional
-%dir /opt/gnome/share/inkscape/extensions
-/opt/gnome/share/inkscape/extensions/[a-ce-zA-Z]*
-/opt/gnome/share/inkscape/extensions/dia2*
-/opt/gnome/share/inkscape/extensions/dots*
-#/opt/gnome/share/inkscape/extensions/dr*
-/opt/gnome/share/inkscape/extensions/dx*
-%ghost /opt/gnome/share/inkscape/extensions/dia.inx
-/opt/gnome/share/pixmaps/inkscape.png
-%dir /usr/share/man/fr/man1
+%{_bindir}/*
+%{_datadir}/applications/inkscape.desktop
+%dir %{_datadir}/inkscape
+%{_datadir}/inkscape/[a-df-z]*
+%{_datadir}/inkscape/exa*
+%{_datadir}/inkscape/extensions-optional
+%dir %{_datadir}/inkscape/extensions
+%{_datadir}/inkscape/extensions/[a-ce-zA-Z]*
+%{_datadir}/inkscape/extensions/dia2*
+%{_datadir}/inkscape/extensions/dots*
+%{_datadir}/inkscape/extensions/dx*
+%ghost %{_datadir}/inkscape/extensions/dia.inx
+%{_datadir}/pixmaps/inkscape.png
+%doc %{_mandir}/man?/*.*
+%doc %{_mandir}/??/man?/*.*
 
 %changelog -n inkscape
+* Mon Jan 22 2007 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
 * Thu Jan 04 2007 - prusnak@suse.cz
 - fixed illegal comparison (siox-max.patch) [#231224]
 * Mon Nov 06 2006 - jhargadon@suse.de