diff --git a/packaging/gnucash-2.1.x.ebuild b/packaging/gnucash-2.1.x.ebuild
index 4f247e4aab..c227786858 100644
--- a/packaging/gnucash-2.1.x.ebuild
+++ b/packaging/gnucash-2.1.x.ebuild
@@ -1,13 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
 
 # This script should work fine for the whole 2.1.x (and hopefully 2.2.x)
-# releases with a simple rename. See
-# http://bugs.gentoo.org/show_bug.cgi?id=122337 for discussion and history
-# about this file.  
-
-# -- jsled-gentoo@asynchronous.org
+# releases with a simple rename.
 
 inherit eutils gnome2 
 
@@ -21,7 +17,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ofx hbci chipcard doc debug quotes nls"
-# mt940
 
 RDEPEND=">=dev-libs/glib-2.6.3
 	>=dev-scheme/guile-1.8
@@ -43,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.6.3
 		chipcard? ( sys-libs/libchipcard )
 	)
 	quotes? ( dev-perl/DateManip
-		dev-perl/Finance-Quote-1.11
+		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
 	app-text/docbook-xsl-stylesheets
 	=app-text/docbook-xml-dtd-4.1.2*
@@ -59,7 +54,9 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	>=dev-lang/swig-1.3.28"
 
-S="${S}."
+if [[ "${PV}" == "2.1.0" ]]; then
+  S="${S}." # packaging bug. :/
+fi
 
 pkg_setup() {
 	built_with_use gnome-extra/libgsf gnome || die "gnome-extra/libgsf must be built with gnome"
@@ -76,6 +73,10 @@ src_compile() {
 		myconf="${myconf} --enable-latex-docs"
 	fi
 
+    if [[ "${PV}" != "2.1.0" ]]; then
+        myconf="${myconf} --enable-tax-specific-locale"
+    fi
+
 	econf \
 		$(use_enable debug) \
 		$(use_enable ofx) \
@@ -97,8 +98,11 @@ src_compile() {
 
 src_install() {
 	gnome2_src_install || die "gnome2_src_install failed"
-	dodoc AUTHORS ChangeLog* COPYING DOCUMENTERS HACKING INSTALL LICENSE NEWS TODO README* doc/README*
-	make_desktop_entry ${P} "GnuCash ${PV}" gnucash-icon.png "GNOME;Office;Finance"
+	dodoc AUTHORS ChangeLog* DOCUMENTERS HACKING INSTALL NEWS TODO README* doc/README*
+    # @fixme: this should use gnucash-icon-48x48.png and art/tango/scaleable/gnucash.svg
+    # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html#key-icon
+    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+	make_desktop_entry ${P} "GnuCash ${PV}" gnucash-icon-48x48.png "GNOME;Office;Finance"
 
 	cd "${WORKDIR}/${PN}-docs-${DOC_VER}"
 	make DESTDIR="${D}" \