diff --git a/multimedia/farsight2/Makefile_am_and_gtk-doc.patch b/multimedia/farsight2/Makefile_am_and_gtk-doc.patch
new file mode 100644
index 0000000000..2cc5db25c8
--- /dev/null
+++ b/multimedia/farsight2/Makefile_am_and_gtk-doc.patch
@@ -0,0 +1,22 @@
+diff -ru ../farsight2-0.0.21.orig/common/gtk-doc.mak ./common/gtk-doc.mak
+--- ../farsight2-0.0.21.orig/common/gtk-doc.mak	2010-06-24 00:20:40.000000000 +0200
++++ ./common/gtk-doc.mak	2010-09-08 01:37:27.036523000 +0200
+@@ -232,6 +232,6 @@
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+diff -ru ../farsight2-0.0.21.orig/python/Makefile.am ./python/Makefile.am
+--- ../farsight2-0.0.21.orig/python/Makefile.am	2009-05-08 23:34:14.000000000 +0200
++++ ./python/Makefile.am	2010-09-08 01:40:08.948271000 +0200
+@@ -1,5 +1,5 @@
+-PYDEFS=`pkg-config --variable=defsdir pygobject-2.0`
+-[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`]
++PYDEFS=`pkg-config --variable=defsdir pygobject-2.0 || \
++			pkg-config --variable=defsdir pygtk-2.0`
+ GSTPYDEFS=`pkg-config --variable=defsdir gst-python-0.10`
+ 
+ AM_CPPFLAGS =						\
diff --git a/multimedia/farsight2/farsight2.SlackBuild b/multimedia/farsight2/farsight2.SlackBuild
index 0a74e841a7..9bdbd3dcc8 100644
--- a/multimedia/farsight2/farsight2.SlackBuild
+++ b/multimedia/farsight2/farsight2.SlackBuild
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=farsight2
-VERSION=${VERSION:-0.0.20}
+VERSION=${VERSION:-0.0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,8 +68,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch --verbose -p1 < $CWD/Makefile_am_and_gtk-doc.patch
+automake
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/multimedia/farsight2/farsight2.info b/multimedia/farsight2/farsight2.info
index 7d66556cbb..c2ea7e2ae9 100644
--- a/multimedia/farsight2/farsight2.info
+++ b/multimedia/farsight2/farsight2.info
@@ -1,8 +1,8 @@
 PRGNAM="farsight2"
-VERSION="0.0.20"
+VERSION="0.0.21"
 HOMEPAGE="http://farsight.freedesktop.org/wiki/"
-DOWNLOAD="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.20.tar.gz"
-MD5SUM="d07628d9a06c4d6989189eec947e4923"
+DOWNLOAD="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.21.tar.gz"
+MD5SUM="5898612c389f3538a4160e677c03087a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"