diff -ruN guile-1.8.7-orig/configure guile-1.8.7/configure
--- guile-1.8.7-orig/configure	2010-07-15 21:53:16.000000000 +0200
+++ guile-1.8.7/configure	2010-07-15 22:24:32.000000000 +0200
@@ -33685,6 +33685,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+
+int find_stack_direction () __attribute__((noinline));
 int
 find_stack_direction ()
 {
diff -ruN guile-1.8.7-orig/guile-config/guile-config.in guile-1.8.7/guile-config/guile-config.in
--- guile-1.8.7-orig/guile-config/guile-config.in	2010-07-15 21:53:16.000000000 +0200
+++ guile-1.8.7/guile-config/guile-config.in	2010-07-15 21:53:49.000000000 +0200
@@ -1,4 +1,4 @@
-#!@-bindir-@/guile \
+#!@-bindir-@/guile-1.8 \
 -e main -s
 !#
 ;;;; guile-config --- utility for linking programs with Guile
diff -ruN guile-1.8.7-orig/guile-config/guile.m4 guile-1.8.7/guile-config/guile.m4
--- guile-1.8.7-orig/guile-config/guile.m4	2010-07-15 21:53:16.000000000 +0200
+++ guile-1.8.7/guile-config/guile.m4	2010-07-15 21:53:49.000000000 +0200
@@ -47,17 +47,17 @@
 # The variables are marked for substitution, as by @code{AC_SUBST}.
 #
 AC_DEFUN([GUILE_PROGS],
- [AC_PATH_PROG(GUILE,guile)
+ [AC_PATH_PROG(GUILE,guile-1.8)
   if test "$GUILE" = "" ; then
       AC_MSG_ERROR([guile required but not found])
   fi
   AC_SUBST(GUILE)
-  AC_PATH_PROG(GUILE_CONFIG,guile-config)
+  AC_PATH_PROG(GUILE_CONFIG,guile-1.8-config)
   if test "$GUILE_CONFIG" = "" ; then
       AC_MSG_ERROR([guile-config required but not found])
   fi
   AC_SUBST(GUILE_CONFIG)
-  AC_PATH_PROG(GUILE_TOOLS,guile-tools)
+  AC_PATH_PROG(GUILE_TOOLS,guile-1.8-tools)
   AC_SUBST(GUILE_TOOLS)
  ])
 
diff -ruN guile-1.8.7-orig/guile-readline/Makefile.in guile-1.8.7/guile-readline/Makefile.in
--- guile-1.8.7-orig/guile-readline/Makefile.in	2010-07-15 21:53:16.000000000 +0200
+++ guile-1.8.7/guile-readline/Makefile.in	2010-07-15 21:53:49.000000000 +0200
@@ -277,7 +277,7 @@
 lib_LTLIBRARIES = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la
 libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
 libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ -export-dynamic -no-undefined
+libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ -module -no-undefined
 BUILT_SOURCES = readline.x
 pkginclude_HEADERS = readline.h
 snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff -ruN guile-1.8.7-orig/guile18-build guile-1.8.7/guile18-build
--- guile-1.8.7-orig/guile18-build	1970-01-01 01:00:00.000000000 +0100
+++ guile-1.8.7/guile18-build	2010-07-15 21:53:49.000000000 +0200
@@ -0,0 +1,10 @@
+#! /bin/sh
+GUILE=guile-1.8
+GUILE_CONFIG=guile-1.8-config
+GUILE_TOOLS=guile-1.8-tools
+PATH="@FINKPREFIX@/share/guile/1.8/scripts/binoverride:$PATH"
+export GUILE
+export GUILE_CONFIG
+export GUILE_TOOLS
+export PATH
+eval "$@"
diff -ruN guile-1.8.7-orig/srfi/Makefile.in guile-1.8.7/srfi/Makefile.in
--- guile-1.8.7-orig/srfi/Makefile.in	2010-07-15 21:53:16.000000000 +0200
+++ guile-1.8.7/srfi/Makefile.in	2010-07-15 21:53:49.000000000 +0200
@@ -360,16 +360,16 @@
 BUILT_SOURCES = srfi-1.x srfi-4.x srfi-13.x srfi-14.x srfi-60.x
 libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_SOURCES = srfi-1.x srfi-1.c
 libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD = ../libguile/libguile.la
-libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_1_INTERFACE@
+libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -module -version-info @LIBGUILE_SRFI_SRFI_1_INTERFACE@
 libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x srfi-4.c
 libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la
-libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
+libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -module -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
 libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c
 libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la
-libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
+libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -module -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
 libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_SOURCES = srfi-60.x srfi-60.c
 libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD = ../libguile/libguile.la
-libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_60_INTERFACE@
+libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -module -version-info @LIBGUILE_SRFI_SRFI_60_INTERFACE@
 srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
 srfi_DATA = srfi-1.scm \
             srfi-2.scm \
diff -ruN guile-1.8.8-orig/test-suite/standalone/Makefile.in guile-1.8.8/test-suite/standalone/Makefile.in
--- guile-1.8.8-orig/test-suite/standalone/Makefile.in	2010-12-13 14:29:40.000000000 -0500
+++ guile-1.8.8/test-suite/standalone/Makefile.in	2011-06-14 10:44:53.000000000 -0400
@@ -398,15 +398,14 @@
   builddir="$(builddir)"					\
   "${top_builddir}/pre-inst-guile-env"
 
-test_cflags = \
+INCLUDES = \
   -I$(top_srcdir)/test-suite/standalone		\
   -I$(top_srcdir) -I$(top_builddir)		\
   $(EXTRA_DEFS) $(GUILE_CFLAGS)
 
-AM_LDFLAGS = $(GUILE_CFLAGS)
 snarfcppopts = \
-  $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS)	\
-  -I$(top_srcdir) -I$(top_builddir)
+  $(DEFS) $(DEFAULT_INCLUDES) -I$(top_srcdir) -I$(top_builddir) \
+  $(CPPFLAGS) $(CFLAGS)
 
 SUFFIXES = .x
 CLEANFILES = *.x
--- guile-1.8.8/doc/ref/gh.texi.orig	2013-03-05 14:14:25.000000000 -0500
+++ guile-1.8.8/doc/ref/gh.texi	2013-03-05 14:20:46.000000000 -0500
@@ -996,7 +996,9 @@
 @deftypefun SCM gh_car (SCM @var{obj})
 @deftypefunx SCM gh_cdr (SCM @var{obj})
 @dots{}
+@end deftypefun
 
+@deftypefun SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
 @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
 These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
 @end deftypefun
--- guile-1.8.8/doc/ref/fdl.texi.orig	2013-03-05 12:37:11.000000000 -0500
+++ guile-1.8.8/doc/ref/fdl.texi	2013-03-05 12:38:13.000000000 -0500
@@ -408,7 +408,7 @@
 @end enumerate
 
 @page
-@appendixsubsec ADDENDUM: How to use this License for your documents
+@appendixsec ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
--- guile-1.8.8/libguile/Makefile.in~	2010-12-13 20:29:39.000000000 +0100
+++ guile-1.8.8/libguile/Makefile.in	2014-04-02 10:29:34.000000000 +0200
@@ -2158,6 +2158,8 @@
 .c.doc:
 	-$(AWK) -f ./guile-func-name-check $<
 	(./guile-snarf-docs $(snarfcppopts) $< | \
+	   sed -e 's|ENDL|\
+|g' -e '/^#/d' | \
 	./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
 
 $(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in
--- guile-1.8.8/libguile/guile-snarf.in~	2010-12-13 18:24:40.000000000 +0100
+++ guile-1.8.8/libguile/guile-snarf.in	2014-04-02 09:17:20.000000000 +0200
@@ -50,7 +50,8 @@
     ## Apparently, AIX's preprocessor is unhappy if you try to #include an
     ## empty file.
     echo "/* cpp arguments: $@ */" ;
-    ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+    ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" | sed -e 's|ENDL|\
+|g' > ${temp} && cpp_ok_p=true
     grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
 }
 
--- guile-1.8.8/libguile/snarf.h~	2010-12-13 18:24:40.000000000 +0100
+++ guile-1.8.8/libguile/snarf.h	2014-04-01 14:46:36.000000000 +0200
@@ -51,14 +51,14 @@
 
 #ifdef SCM_MAGIC_SNARF_INITS
 # define SCM_SNARF_HERE(X)
-# define SCM_SNARF_INIT(X) ^^ X ^:^
+# define SCM_SNARF_INIT(x) ENDL^^ x ^:^
 # define SCM_SNARF_DOCS(TYPE, CNAME, FNAME, ARGLIST, REQ, OPT, VAR, DOCSTRING)
 #else
 # ifdef SCM_MAGIC_SNARF_DOCS
 #  define SCM_SNARF_HERE(X)
 #  define SCM_SNARF_INIT(X)
 #  define SCM_SNARF_DOCS(TYPE, CNAME, FNAME, ARGLIST, REQ, OPT, VAR, DOCSTRING) \
-^^ { \
+ENDL^^ { \
 cname CNAME ^^ \
 fname FNAME ^^ \
 type TYPE ^^ \
@@ -272,7 +272,7 @@
 
 #ifdef SCM_MAGIC_SNARF_DOCS
 #undef SCM_ASSERT
-#define SCM_ASSERT(_cond, _arg, _pos, _subr) ^^ argpos _arg _pos __LINE__ ^^
+#define SCM_ASSERT(_cond, _arg, _pos, _subr) ENDL^^ argpos _arg _pos __LINE__ ^^
 #endif /* SCM_MAGIC_SNARF_DOCS */
 
 #endif  /* SCM_SNARF_H */