diff --git a/grisbi.changes b/grisbi.changes
index 0e7c3b0..efcb369 100644
--- a/grisbi.changes
+++ b/grisbi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 29 01:31:44 CEST 2011 - vuntz@opensuse.org
+
+- Cleanup for inclusion in Factory.
+
 -------------------------------------------------------------------
 Fri Apr  8 10:57:00 UTC 2011 - cbosdonnat@novell.com
 
diff --git a/grisbi.desktop b/grisbi.desktop
deleted file mode 100644
index f29bda1..0000000
--- a/grisbi.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Grisbi
-Comment=Personal Accounting Application
-Comment[en]=Personal Accounting Application
-Comment[fr]=Gestion de comptes banquaires
-Exec=grisbi
-Icon=grisbi.png
-Terminal=0
-Type=Application
-
-Categories=Office
diff --git a/grisbi.spec b/grisbi.spec
index 0446d74..8615c8b 100644
--- a/grisbi.spec
+++ b/grisbi.spec
@@ -4,115 +4,75 @@
 
 Name:           grisbi
 Version:        0.6.0
-Release:        0
-License:        GNU General Public License (GPL)
+Release:        1
+License:        GPLv2+
 Summary:        Personal Accounting Application
 Url:            http://www.grisbi.org
 Group:          Productivity/Office/Finance
 Source:         http://prdownloads.sourceforge.net/grisbi/grisbi-%{version}.tar.bz2
-Source1:        grisbi.desktop
+# Needed for make check
+#BuildRequires:  cunit-devel
 BuildRequires:  fdupes
-BuildRequires:  cunit-devel
-BuildRequires:  gcc
-BuildRequires:  glibc-devel
-BuildRequires:  gnome-mime-data
-BuildRequires:  make
+BuildRequires:  intltool
+BuildRequires:  libofx-devel
 BuildRequires:  openssl-devel
-BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  zlib-devel
+Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libofx-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
-BuildRequires:  intltool
-BuildRequires:  update-desktop-files
 
 %description
-Grisbi is a personnal accounting application for Linux, written with Gnome and
-Gtk, and is released under the GPL licence.
+Grisbi is a personal accounting application, aiming at providing the most
+simple and intuitive software for basic use, although it can be very powerful
+if you spend a little time on the setup.
 
-Our aim is to provide you with the most simple and intuitive software for
-basic use, although it can be very powerful if you spend a little time on the
-setup.
-
-Grisbi is an application written by French developpers, so it perfectly
-respects French accounting rules. Grisbi can manage multiple accounts,
-currencies and users. It manages third party, expenditure and receipt
-categories, and also budgetary lines, financial years, and other informations
-that make Grisbi adapted for associations (except those that require double
-entry accounting).
+One notable feature is that it respects French accounting rules.
 
 %lang_package
-
-%debug_package
 %prep
 %setup -q
 
 %build
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-CFLAGS="%{optflags} -g" \
-CXXFLAGS="%{optflags} -g" \
 %configure \
-	--disable-schemas-install \
-	--includedir="%{_prefix}" \
-	--with-ofx
-
+        --disable-static \
+        --with-ofx
 make %{?jobs:-j%{jobs}}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
 %make_install
+rm %{buildroot}%{_libdir}/grisbi/*.la
+# Those files are deprecated and not needed anymore
+rm %{buildroot}%{_datadir}/mime-info/grisbi.{keys,mime}
+%suse_update_desktop_file %{name}
+%find_lang %{name} %{?no_lang_C}
+%find_lang %{name}-tips %{?no_lang_C} %{name}.lang
+%fdupes -s %{buildroot}%{_datadir}/
 
-%__rm "%{buildroot}%{_libdir}/grisbi"/*.{a,la}
-
-install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/%{name}.desktop"
-%suse_update_desktop_file -r "%{name}" Office Finance
-%fdupes -s %{buildroot}/%{_datadir}
-
-%find_lang "%{name}"
-%find_lang "%{name}-tips"
-cat "%{name}.lang" "%{name}-tips.lang" > t
-mv t "%{name}.lang"
-
-L="$PWD/%{name}.lang"
-pushd "%{buildroot}%{_datadir}/grisbi/categories"
-/bin/ls -1 | while read l; do
-    [ -d "$l" ] || continue
-    [ "$l" = "C" ] && continue
-    echo "%lang($l) %{_datadir}/grisbi/categories/$l" >>"$L"
-done
-popd
-
-%check
-make check
+# We need cunit for this
+#%%check
+#make check
 
 %clean
 %{?buildroot:rm -rf %{buildroot}}
 
 %files
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/grisbi
-%{_datadir}/doc/grisbi
-%{_datadir}/mime-info/grisbi.keys
-%{_datadir}/mime-info/grisbi.mime
-%{_datadir}/pixmaps/grisbi
+%doc %{_mandir}/man1/grisbi.1%{?ext_man}
 %{_datadir}/applications/grisbi.desktop
-%doc %{_mandir}/man1/grisbi.1%{ext_man}
+%{_datadir}/doc/grisbi/
+%{_datadir}/grisbi/
+%{_datadir}/icons/*/*/apps/grisbi.*
+%{_datadir}/pixmaps/grisbi/
 %dir %{_libdir}/grisbi
+# Explicitly list plugins
 %{_libdir}/grisbi/gnucash.so
 %{_libdir}/grisbi/ofx.so
 %{_libdir}/grisbi/openssl.so
-%dir %{_datadir}/grisbi
-%dir %{_datadir}/grisbi/categories
-%{_datadir}/grisbi/categories/C
-%{_datadir}/grisbi/tips.txt
-%{_datadir}/icons/*/*/apps/grisbi.*
 
-%files lang -f "%{name}.lang"
-%defattr(-,root,root)
+%files lang -f %{name}.lang
 
 # vim: set sw=4 ts=4 et:
+%changelog