diff --git a/dia.changes b/dia.changes
index 530639d..b973ca2 100644
--- a/dia.changes
+++ b/dia.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 22 15:38:58 CET 2007 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+- Enabled GNOME print support.
+
 -------------------------------------------------------------------
 Tue Nov 14 15:36:28 CET 2006 - sbrabec@suse.cz
 
diff --git a/dia.spec b/dia.spec
index 0a4b97a..36000aa 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dia (Version 0.95)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,16 +11,15 @@
 # norootforbuild
 
 Name:           dia
-BuildRequires:  docbook-toys docbook-xsl-stylesheets gcc-c++ gnome-patch-translation intltool libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gtk-devel sgml-skel update-desktop-files
-%define prefix /opt/gnome
+BuildRequires:  docbook-toys docbook-xsl-stylesheets gcc-c++ gnome-patch-translation intltool libgnomeprint-devel libgnomeui-devel libxslt-devel python-devel python-gtk-devel scrollkeeper sgml-skel update-desktop-files
 License:        GNU General Public License (GPL)
 Group:          Productivity/Graphics/Other
 Requires:       ghostscript-fonts-std python-gtk python-numeric
 Autoreqprov:    on
 Summary:        A Diagram Creation Program
 Version:        0.95
-Release:        23
-Source:         ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{version}.tar.bz2
+Release:        38
+Source:         ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Source1:        font-test-japanese.dia
 Source2:        font-test-czech.dia
 Source3:        font-test-german-euro.dia
@@ -57,7 +56,7 @@ Authors:
     Alexander Larsson <alla@lysator.liu.se>
 
 %prep
-%setup
+%setup -q
 gnome-patch-translation-prepare
 %patch -p1
 %patch3
@@ -75,44 +74,41 @@ gnome-patch-translation-update
 cp $RPM_SOURCE_DIR/font-test*dia .
 
 %build
-autoconf
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CPPFLAGS="$(pkg-config --cflags cairo)"
-./configure --prefix=%prefix \
-	    --mandir=%_mandir \
-	    --sysconfdir=/etc%_prefix \
-	    --libdir=%prefix/%_lib \
-	    --enable-db2html \
-	    --enable-gnome \
-	    --with-python \
-	    --with-cairo
-make
+autoreconf -f -i
+%configure\
+	--enable-db2html\
+	--enable-gnome\
+	--with-python\
+	--with-cairo\
+	--with-gnomeprint
+make docdir=%{_docdir}/%{name} %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall docdir=%{_docdir}/%{name}
 %suse_update_desktop_file -r -C "" -G "Diagram Editor" dia Office FlowChart GNOME
 %find_lang dia
+cp -a AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia $RPM_BUILD_ROOT%{_docdir}/%{name}/
+# No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml
+rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f dia.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL 
-%doc KNOWN_BUGS NEWS README TODO samples/*.dia
-%doc font-test*dia
-%_mandir/man1/*
-%prefix/bin/*
-%prefix/%_lib/dia
-%prefix/share/dia
-%prefix/share/applications/*.desktop
-#%prefix/share/gnome/help/*
-%dir %prefix/share/gnome/help/dia/C
-%prefix/share/mime-info/*
-%prefix/share/pixmaps/*
+%doc %{_docdir}/%{name}
+%{_bindir}/*
+%{_libdir}/dia
+%{_datadir}/applications/*.desktop
+%{_datadir}/dia
+%{_datadir}/pixmaps/*
+%doc %{_mandir}/man1/*.*
 
 %changelog -n dia
+* Mon Jan 22 2007 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
+- Enabled GNOME print support.
 * Tue Nov 14 2006 - sbrabec@suse.cz
 - Re-enabled use of gnome-patch-translation.
 * Sun Nov 12 2006 - stbinner@suse.de