diff --git a/guile-testsuite-build.patch b/guile-testsuite-build.patch
new file mode 100644
index 0000000..77559f9
--- /dev/null
+++ b/guile-testsuite-build.patch
@@ -0,0 +1,33 @@
+Index: guile-1.8.7/test-suite/standalone/Makefile.am
+===================================================================
+--- guile-1.8.7.orig/test-suite/standalone/Makefile.am
++++ guile-1.8.7/test-suite/standalone/Makefile.am
+@@ -28,7 +28,7 @@ check_SCRIPTS =
+ BUILT_SOURCES =
+ EXTRA_DIST =
+ 
+-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
++TESTS_ENVIRONMENT = builddir="$(builddir)" "${top_builddir}/pre-inst-guile-env"
+ 
+ test_cflags =					\
+   -I$(top_srcdir)/test-suite/standalone		\
+Index: guile-1.8.7/test-suite/standalone/test-asmobs
+===================================================================
+--- guile-1.8.7.orig/test-suite/standalone/test-asmobs
++++ guile-1.8.7/test-suite/standalone/test-asmobs
+@@ -2,7 +2,7 @@
+ exec guile -q -s "$0" "$@"
+ !#
+ 
+-(load-extension "libtest-asmobs" "libtest_asmobs_init")
++(load-extension (string-append (getenv "builddir") "/libtest-asmobs") "libtest_asmobs_init")
+ 
+ (define (test x v)
+   (if v
+@@ -114,4 +114,4 @@ exec guile -q -s "$0" "$@"
+ 
+ ;; Local Variables:
+ ;; mode: scheme
+-;; End:
+\ No newline at end of file
++;; End:
diff --git a/guile.changes b/guile.changes
index 0bb1dc1..73dc7c9 100644
--- a/guile.changes
+++ b/guile.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan 26 19:26:58 CET 2010 - pgajdos@suse.cz
+
+- fixed build:
+
+ "Earlier versions of ltdl would look for extensions under $PWD; this
+  behavior changed in 2.2.6b."
+
+  * testsuite-build.patch taken from guile git (1.8 branch)
+
 -------------------------------------------------------------------
 Mon Nov 30 17:49:57 CET 2009 - pgajdos@suse.cz
 
diff --git a/guile.spec b/guile.spec
index 03a0799..640d11b 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package guile (Version 1.8.7)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,13 +23,14 @@ License:        LGPLv2.1+
 Group:          Development/Languages/Scheme
 AutoReqProv:    on
 Version:        1.8.7
-Release:        1
+Release:        2
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 Url:            http://www.gnu.org/software/guile/
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         %{name}-64bit.patch
 Patch2:         %{name}-1.6.10-mktemp.patch
 Patch3:         %{name}-popen-test.patch
+Patch4:         %{name}-testsuite-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         fileutils sh-utils
 PreReq:         %install_info_prereq
@@ -88,6 +89,7 @@ Authors:
 %patch1
 %patch2
 %patch3 -p1
+%patch4 -p1
 # guile-1.8.1: The code is not so good for -Werror (unused results of write()).
 sed -i s/-Werror// configure.in configure
 # force rebuild with non-broken makeinfo