diff --git a/guile/0002-install-fix.all.patch b/guile/0002-install-fix.all.patch
deleted file mode 100644
index 10492e6b..00000000
--- a/guile/0002-install-fix.all.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- guile-039300a1ebee116082d50d61e6b3aeafc8a741ec/meta/Makefile.am.orig	2013-04-10 10:24:34 +0400
-+++ guile-039300a1ebee116082d50d61e6b3aeafc8a741ec/meta/Makefile.am	2013-04-10 11:07:52 +0400
-@@ -30,9 +30,9 @@
- # What we now call `guild' used to be known as `guile-tools'.
- install-exec-hook:
- 	guild="`echo $(ECHO_N) guild				\
--	   | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ;	\
-+	   | $(SED) -e '$(program_transform_name)'`" ;	\
- 	guile_tools="`echo $(ECHO_N) guile-tools		\
--	   | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ;	\
-+	   | $(SED) -e '$(program_transform_name)'`" ;	\
- 	cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" &&	\
- 	$(LN_S) "$$guild" "$$guile_tools"
- 
diff --git a/guile/0003-fix-gnulib.all.patch b/guile/0003-fix-gnulib.all.patch
deleted file mode 100644
index cb2a34d8..00000000
--- a/guile/0003-fix-gnulib.all.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- guile-2.0.9/lib/msvc-inval.c.orig	2013-02-18 20:37:43.000000000 +0000
-+++ guile-2.0.9/lib/msvc-inval.c	2013-06-17 12:31:14.815168600 +0000
-@@ -28,7 +28,7 @@
- 
- # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
- 
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,
-@@ -45,7 +45,7 @@
- 
- #  if defined _MSC_VER
- 
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,
-@@ -94,7 +94,7 @@
-     }
- }
- 
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,
diff --git a/guile/PKGBUILD b/guile/PKGBUILD
index e48e82b8..f6d2a110 100644
--- a/guile/PKGBUILD
+++ b/guile/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-pkgbase='guile'
+pkgbase=guile
 pkgname=("$pkgbase" "lib${pkgbase}" "lib${pkgbase}-devel")
-pkgver=2.0.9
+pkgver=2.0.11
 pkgrel=1
 pkgdesc="a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
@@ -10,49 +10,45 @@ arch=(i686 x86_64)
 license=('GPL')
 depends=('gmp' 'libltdl' 'ncurses' 'texinfo' 'libunistring' 'libgc' 'libffi')
 makedepends=('gmp-devel' 'ncurses-devel' 'libunistring-devel' 'libgc-devel' 'libffi-devel')
-install=guile.install
 source=("ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-    0002-install-fix.all.patch
-    2.0.9-module-ldflags.patch
-    0003-fix-gnulib.all.patch
-    guile-2.0.9-export-symbols.patch
-    guile-2.0.9-msys2.patch)
+        2.0.9-module-ldflags.patch
+        guile-2.0.9-export-symbols.patch
+        guile-2.0.9-msys2.patch)
 options=('!libtool')
-md5sums=('531839c3fe887382ca9d4774db544d34'
-         'ed5d94a5bcefd1ebedb3dc76f98de4b5'
+md5sums=('e532c68c6f17822561e3001136635ddd'
          'bf85cd18f7d1c1ab14a02b8eccf6691a'
-         'e480cf9cbbbef9f8198fca3c395fddb5'
          '4eb6e6498afe1c704026d499046287ab'
-         '599d0f66e6d8d329c99a5784d2d2bcc6')
+         'ccf1f4a340b21de9f93a5a02a78bf50d')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   
-  patch -p1 -i ${srcdir}/0002-install-fix.all.patch
   patch -p2 -i ${srcdir}/2.0.9-module-ldflags.patch
-  patch -p1 -i ${srcdir}/0003-fix-gnulib.all.patch
   patch -p1 -i ${srcdir}/guile-2.0.9-export-symbols.patch
   patch -p1 -i ${srcdir}/guile-2.0.9-msys2.patch
   
+  cp -rf build-aux/snippet ${srcdir}/snippet
   autoreconf -fi
+  cp -f ${srcdir}/snippet/* build-aux/snippet/
 }
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --build=${CHOST} \
+  ./configure \
+    --build=${CHOST} \
     --prefix=/usr \
-  --disable-debug-malloc \
-  --disable-guile-debug \
-  --disable-error-on-warning \
-  --disable-rpath \
-  --enable-deprecated \
-  --enable-networking \
-  --enable-nls \
-  --enable-posix \
-  --enable-regex \
-  --with-threads \
-  --with-modules \
-  --disable-static
+    --disable-debug-malloc \
+    --disable-guile-debug \
+    --disable-error-on-warning \
+    --disable-rpath \
+    --enable-deprecated \
+    --enable-networking \
+    --enable-nls \
+    --enable-posix \
+    --enable-regex \
+    --with-threads \
+    --with-modules \
+    --disable-static
   make
   make DESTDIR="${srcdir}/dest" install
 }
@@ -61,12 +57,12 @@ package_guile() {
   depends=('libguile')
   install=${pkgbase}.install
 
-  install -dm755 ${pkgdir}/usr/bin
+  mkdir -p ${pkgdir}/usr/bin
   cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/
   rm -f ${pkgdir}/usr/bin/*.dll
   rm -f ${pkgdir}/usr/bin/*-config
   
-  install -dm644 ${pkgdir}/usr/share
+  mkdir -p ${pkgdir}/usr/share
   #cp -rf ${srcdir}/dest/usr/share/doc $pkgdir/usr/share/
   cp -rf ${srcdir}/dest/usr/share/info ${pkgdir}/usr/share/
   cp -rf ${srcdir}/dest/usr/share/man ${pkgdir}/usr/share/
@@ -75,14 +71,14 @@ package_guile() {
 package_libguile() {
   groups=('libraries')
 
-  install -dm755 ${pkgdir}/usr/bin
+  mkdir -p ${pkgdir}/usr/bin
   install -Dm755 ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
   install -Dm755 ${srcdir}/dest/usr/lib/*.dll ${pkgdir}/usr/bin/
   
   #cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
-  install -dm644 ${pkgdir}/usr/lib
+  mkdir -p ${pkgdir}/usr/lib
   cp -rf ${srcdir}/dest/usr/lib/guile ${pkgdir}/usr/lib/
-  install -dm644 ${pkgdir}/usr/share
+  mkdir -p ${pkgdir}/usr/share
   cp -rf ${srcdir}/dest/usr/share/guile ${pkgdir}/usr/share/
 }
 
@@ -91,13 +87,13 @@ package_libguile-devel() {
   groups=('development')
   options=('staticlibs')
   
-  install -dm755 ${pkgdir}/usr/bin
+  mkdir -p ${pkgdir}/usr/bin
   install -Dm755 ${srcdir}/dest/usr/bin/*-config ${pkgdir}/usr/bin/
   cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
-  install -dm644 ${pkgdir}/usr/lib
+  mkdir -p ${pkgdir}/usr/lib
   cp -rf ${srcdir}/dest/usr/lib/*.a ${pkgdir}/usr/lib/
   cp -rf ${srcdir}/dest/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-  install -dm644 ${pkgdir}/usr/share
+  mkdir -p ${pkgdir}/usr/share
   cp -rf ${srcdir}/dest/usr/share/aclocal ${pkgdir}/usr/share/
 
-}
\ No newline at end of file
+}
diff --git a/guile/guile-2.0.9-msys2.patch b/guile/guile-2.0.9-msys2.patch
index 9bc54c52..c561b7fb 100644
--- a/guile/guile-2.0.9-msys2.patch
+++ b/guile/guile-2.0.9-msys2.patch
@@ -101,233 +101,6 @@ diff -Naur guile-2.0.9-orig/build-aux/config.rpath guile-2.0.9/build-aux/config.
      shrext=.dll
      library_names_spec='$libname.dll.a $libname.lib'
      ;;
-diff -Naur guile-2.0.9-orig/build-aux/ltmain.sh guile-2.0.9/build-aux/ltmain.sh
---- guile-2.0.9-orig/build-aux/ltmain.sh	2013-01-28 20:35:00.000000000 +0000
-+++ guile-2.0.9/build-aux/ltmain.sh	2013-04-25 07:40:59.071289100 +0000
-@@ -1180,7 +1180,7 @@
-   test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
--    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+    *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
-       # don't eliminate duplications in $postdeps and $predeps
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-@@ -2123,7 +2123,7 @@
- 
-     # On Cygwin there's no "real" PIC flag so we must build both object types
-     case $host_os in
--    cygwin* | mingw* | pw32* | os2* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
-       pic_mode=default
-       ;;
-     esac
-@@ -2992,7 +2992,7 @@
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
--	  cygwin* | mingw* | pw32* | cegcc*)
-+	  cygwin* | msys* | mingw* | pw32* | cegcc*)
- 	    case $realname in
- 	    *.dll.a)
- 	      tstripme=""
-@@ -3098,7 +3098,7 @@
- 
- 	# Do a test to see if this is really a libtool program.
- 	case $host in
--	*cygwin* | *mingw*)
-+	*cygwin* | *msys* | *mingw*)
- 	    if func_ltwrapper_executable_p "$file"; then
- 	      func_ltwrapper_scriptname "$file"
- 	      wrapper=$func_ltwrapper_scriptname_result
-@@ -3173,7 +3173,7 @@
- 	# remove .exe since cygwin /usr/bin/install will append another
- 	# one anyway
- 	case $install_prog,$host in
--	*/usr/bin/install*,*cygwin*)
-+	*/usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
- 	  case $file:$destfile in
- 	  *.exe:*.exe)
- 	    # this is ok
-@@ -3323,7 +3323,7 @@
- 	      $RM $export_symbols
- 	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	      case $host in
--	      *cygwin* | *mingw* | *cegcc* )
-+	      *cygwin* | *msys* | *mingw* | *cegcc* )
-                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- 	        ;;
-@@ -3335,7 +3335,7 @@
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
--	        *cygwin* | *mingw* | *cegcc* )
-+	        *cygwin* | *msys* | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
-@@ -3349,7 +3349,7 @@
- 	  func_basename "$dlprefile"
- 	  name="$func_basename_result"
-           case $host in
--	    *cygwin* | *mingw* | *cegcc* )
-+	    *cygwin* | *msys* | *mingw* | *cegcc* )
- 	      # if an import library, we need to obtain dlname
- 	      if func_win32_import_lib_p "$dlprefile"; then
- 	        func_tr_sh "$dlprefile"
-@@ -3502,7 +3502,7 @@
- 	# Transform the symbol file into the correct name.
- 	symfileobj="$output_objdir/${my_outputname}S.$objext"
- 	case $host in
--	*cygwin* | *mingw* | *cegcc* )
-+	*cygwin* | *msys* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
- 	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-@@ -4375,7 +4375,7 @@
- 	{
- EOF
- 	    case "$host" in
--	      *mingw* | *cygwin* )
-+	      *mingw* | *cygwin* | *msys* )
- 		# make stdout use "unix" line endings
- 		echo "          setmode(1,_O_BINARY);"
- 		;;
-@@ -5094,7 +5094,7 @@
- {
-     $opt_debug
-     case $host in
--    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+    *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-       # It is impossible to link a dll without this setting, and
-       # we shouldn't force the makefile maintainer to figure out
-       # which system we are compiling for in order to pass an extra
-@@ -5581,7 +5581,7 @@
- 	  ;;
- 	esac
- 	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
-@@ -5601,7 +5601,7 @@
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -5679,7 +5679,7 @@
- 
-       -no-install)
- 	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-+	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
- 	  # The PATH hackery in wrapper scripts is required on Windows
- 	  # and Darwin in order for the loader to find any dlls it needs.
- 	  func_warning "\`-no-install' is ignored for $host"
-@@ -6545,7 +6545,7 @@
- 	  fi
- 	  case "$host" in
- 	    # special handling for platforms with PE-DLLs.
--	    *cygwin* | *mingw* | *cegcc* )
-+	    *cygwin* | *msys* | *mingw* | *cegcc* )
- 	      # Linker will automatically link against shared library if both
- 	      # static and shared are present.  Therefore, ensure we extract
- 	      # symbols from the import library if a shared library is present
-@@ -6689,7 +6689,7 @@
- 	if test -n "$library_names" &&
- 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
- 	  case $host in
--	  *cygwin* | *mingw* | *cegcc*)
-+	  *cygwin* | *msys* | *mingw* | *cegcc*)
- 	      # No point in relinking DLLs because paths are not encoded
- 	      func_append notinst_deplibs " $lib"
- 	      need_relink=no
-@@ -6759,7 +6759,7 @@
- 	    elif test -n "$soname_spec"; then
- 	      # bleh windows
- 	      case $host in
--	      *cygwin* | mingw* | *cegcc*)
-+	      *cygwin* | *msys* | mingw* | *cegcc*)
- 	        func_arith $current - $age
- 		major=$func_arith_result
- 		versuffix="-$major"
-@@ -7620,7 +7620,7 @@
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
-@@ -8134,7 +8134,7 @@
- 
- 	orig_export_symbols=
- 	case $host_os in
--	cygwin* | mingw* | cegcc*)
-+	cygwin* | msys* | mingw* | cegcc*)
- 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
- 	    # exporting using user supplied symfile
- 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-@@ -8690,7 +8690,7 @@
- 
-     prog)
-       case $host in
--	*cygwin*) func_stripname '' '.exe' "$output"
-+	*cygwin* | *msys*) func_stripname '' '.exe' "$output"
- 	          output=$func_stripname_result.exe;;
-       esac
-       test -n "$vinfo" && \
-@@ -8803,7 +8803,7 @@
- 	  esac
- 	fi
- 	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
-@@ -8881,7 +8881,7 @@
-         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-         wrappers_required=no
-         ;;
--      *cygwin* | *mingw* )
-+      *cygwin* | *msys* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-@@ -9028,14 +9028,14 @@
- 	esac
- 	# test for cygwin because mv fails w/o .exe extensions
- 	case $host in
--	  *cygwin*)
-+	  *cygwin* | *msys*)
- 	    exeext=.exe
- 	    func_stripname '' '.exe' "$outputname"
- 	    outputname=$func_stripname_result ;;
- 	  *) exeext= ;;
- 	esac
- 	case $host in
--	  *cygwin* | *mingw* )
-+	  *cygwin* | *msys* | *mingw* )
- 	    func_dirname_and_basename "$output" "" "."
- 	    output_name=$func_basename_result
- 	    output_path=$func_dirname_result
-@@ -9365,7 +9365,7 @@
- 	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-+	    *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
- 	      # If a -bindir argument was supplied, place the dll there.
- 	      if test "x$bindir" != x ;
- 	      then
 diff -Naur guile-2.0.9-orig/config.rpath guile-2.0.9/config.rpath
 --- guile-2.0.9-orig/config.rpath	2010-12-08 09:06:14.000000000 +0000
 +++ guile-2.0.9/config.rpath	2013-04-25 07:30:05.668945300 +0000
@@ -376,217 +149,6 @@ diff -Naur guile-2.0.9-orig/config.rpath guile-2.0.9/config.rpath
      shrext=.dll
      library_names_spec='$libname.dll.a $libname.lib'
      ;;
-diff -Naur guile-2.0.9-orig/configure guile-2.0.9/configure
---- guile-2.0.9-orig/configure	2013-04-09 23:40:04.000000000 +0000
-+++ guile-2.0.9/configure	2013-04-25 07:34:08.722656300 +0000
-@@ -4648,7 +4648,7 @@
- enable_win32_dll=yes
- 
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
-@@ -8985,7 +8985,7 @@
-         # special semantics and is distinct from /, please report it to
-         # <bug-gnulib@gnu.org>.
-         case $host in
--          *-cygwin | i370-ibm-openedition)
-+          *-cygwin | *-msys | i370-ibm-openedition)
-             gl_cv_double_slash_root=yes ;;
-           *)
-             # Be optimistic and assume that / and // are the same when we
-@@ -16246,7 +16246,7 @@
-   case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | freebsd* | netbsd* | openbsd* \
--          | hpux* | solaris* | cygwin* | mingw*)
-+          | hpux* | solaris* | cygwin* | msys* | mingw*)
-             ac_cv_func_malloc_0_nonnull=yes ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_malloc_0_nonnull=no ;;
-@@ -21095,7 +21095,7 @@
-         # special semantics and is distinct from /, please report it to
-         # <bug-gnulib@gnu.org>.
-         case $host in
--          *-cygwin | i370-ibm-openedition)
-+          *-cygwin | *-msys | i370-ibm-openedition)
-             gl_cv_double_slash_root=yes ;;
-           *)
-             # Be optimistic and assume that / and // are the same when we
-@@ -21139,6 +21139,8 @@
-              gl_cv_func_dup2_works="guessing no" ;;
-            cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
-              gl_cv_func_dup2_works="guessing no" ;;
-+           msys*) # on MSYS, dup2(1,1) returns 0
-+             gl_cv_func_dup2_works="guessing no" ;;
-            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
-                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-              gl_cv_func_dup2_works="guessing no" ;;
-@@ -25810,7 +25812,7 @@
-   case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | freebsd* | netbsd* | openbsd* \
--          | hpux* | solaris* | cygwin* | mingw*)
-+          | hpux* | solaris* | cygwin* | msys* | mingw*)
-             ac_cv_func_malloc_0_nonnull=yes ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_malloc_0_nonnull=no ;;
-@@ -34907,7 +34909,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
--  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -35096,7 +35098,7 @@
-       *-*-mingw* ) # actually msys
-         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-         ;;
--      *-*-cygwin* )
-+      *-*-cygwin* | *-*-msys* )
-         lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-         ;;
-       * ) # otherwise, assume *nix
-@@ -35104,12 +35106,12 @@
-         ;;
-     esac
-     ;;
--  *-*-cygwin* )
-+  *-*-cygwin* | *-*-msys* )
-     case $build in
-       *-*-mingw* ) # actually msys
-         lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-         ;;
--      *-*-cygwin* )
-+      *-*-cygwin* | *-*-msys* )
-         lt_cv_to_host_file_cmd=func_convert_file_noop
-         ;;
-       * ) # otherwise, assume *nix
-@@ -35175,7 +35177,7 @@
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     if test "$GCC" != yes; then
-       reload_cmds=false
-     fi
-@@ -35330,7 +35332,7 @@
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
--cygwin*)
-+cygwin* | msys*)
-   # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-@@ -35648,7 +35650,7 @@
-   lt_cv_sharedlib_from_linklib_cmd='unknown'
- 
- case $host_os in
--cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   # two different shell functions defined in ltmain.sh
-   # decide which to use based on capabilities of $DLLTOOL
-   case `$DLLTOOL --help 2>&1` in
-@@ -36140,7 +36142,7 @@
- aix*)
-   symcode='[BCDT]'
-   ;;
--cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   symcode='[ABCDGISTW]'
-   ;;
- hpux*)
-@@ -37959,7 +37961,7 @@
-       # PIC is the default for these OSes.
-       ;;
- 
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -38043,7 +38045,7 @@
-       fi
-       ;;
- 
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -38534,7 +38536,7 @@
-   extract_expsyms_cmds=
- 
-   case $host_os in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -38649,7 +38651,7 @@
-       fi
-       ;;
- 
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-       # as there is no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -39106,7 +39108,7 @@
-       export_dynamic_flag_spec=-rdynamic
-       ;;
- 
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -40059,7 +40061,7 @@
-   # libtool to hard-code these into programs
-   ;;
- 
--cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-@@ -40091,6 +40093,12 @@
- 
-       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-       ;;
-+    msys*)
-+      # MSYS DLLs use 'msys-' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+
-+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-+      ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-@@ -40125,7 +40133,7 @@
-       # Convert to MSYS style.
-       sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-       ;;
--    cygwin*)
-+    cygwin* | msys*)
-       # Convert to unix form, then to dos form, then back to unix form
-       # but this time dos style (no spaces!) so that the unix form looks
-       # like /cygdrive/c/PROGRA~1:/cygdr...
-@@ -40786,7 +40794,7 @@
-     lt_cv_dlopen_libs=
-     ;;
- 
--  cygwin*)
-+  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
-     lt_cv_dlopen_libs=
-     ;;
 diff -Naur guile-2.0.9-orig/guile-readline/config.guess guile-2.0.9/guile-readline/config.guess
 --- guile-2.0.9-orig/guile-readline/config.guess	2010-12-13 19:29:24.000000000 +0000
 +++ guile-2.0.9/guile-readline/config.guess	2013-04-25 07:42:24.603515600 +0000
@@ -622,233 +184,6 @@ diff -Naur guile-2.0.9-orig/guile-readline/config.sub guile-2.0.9/guile-readline
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-diff -Naur guile-2.0.9-orig/guile-readline/ltmain.sh guile-2.0.9/guile-readline/ltmain.sh
---- guile-2.0.9-orig/guile-readline/ltmain.sh	2010-12-13 19:29:17.000000000 +0000
-+++ guile-2.0.9/guile-readline/ltmain.sh	2013-04-25 07:46:04.357421900 +0000
-@@ -1179,7 +1179,7 @@
-   test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
--    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+    *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
-       # don't eliminate duplications in $postdeps and $predeps
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-@@ -2122,7 +2122,7 @@
- 
-     # On Cygwin there's no "real" PIC flag so we must build both object types
-     case $host_os in
--    cygwin* | mingw* | pw32* | os2* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
-       pic_mode=default
-       ;;
-     esac
-@@ -2991,7 +2991,7 @@
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
--	  cygwin* | mingw* | pw32* | cegcc*)
-+	  cygwin* | msys* | mingw* | pw32* | cegcc*)
- 	    case $realname in
- 	    *.dll.a)
- 	      tstripme=""
-@@ -3097,7 +3097,7 @@
- 
- 	# Do a test to see if this is really a libtool program.
- 	case $host in
--	*cygwin* | *mingw*)
-+	*cygwin* | *msys* | *mingw*)
- 	    if func_ltwrapper_executable_p "$file"; then
- 	      func_ltwrapper_scriptname "$file"
- 	      wrapper=$func_ltwrapper_scriptname_result
-@@ -3172,7 +3172,7 @@
- 	# remove .exe since cygwin /usr/bin/install will append another
- 	# one anyway
- 	case $install_prog,$host in
--	*/usr/bin/install*,*cygwin*)
-+	*/usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
- 	  case $file:$destfile in
- 	  *.exe:*.exe)
- 	    # this is ok
-@@ -3320,7 +3320,7 @@
- 	      $RM $export_symbols
- 	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	      case $host in
--	      *cygwin* | *mingw* | *cegcc* )
-+	      *cygwin* | *msys* | *mingw* | *cegcc* )
-                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- 	        ;;
-@@ -3332,7 +3332,7 @@
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
--	        *cygwin* | *mingw* | *cegcc* )
-+	        *cygwin* | *msys* | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
-@@ -3346,7 +3346,7 @@
- 	  func_basename "$dlprefile"
- 	  name="$func_basename_result"
-           case $host in
--	    *cygwin* | *mingw* | *cegcc* )
-+	    *cygwin* | *msys* | *mingw* | *cegcc* )
- 	      # if an import library, we need to obtain dlname
- 	      if func_win32_import_lib_p "$dlprefile"; then
- 	        func_tr_sh "$dlprefile"
-@@ -3499,7 +3499,7 @@
- 	# Transform the symbol file into the correct name.
- 	symfileobj="$output_objdir/${my_outputname}S.$objext"
- 	case $host in
--	*cygwin* | *mingw* | *cegcc* )
-+	*cygwin* | *msys* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
- 	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-@@ -4369,7 +4369,7 @@
- 	{
- EOF
- 	    case "$host" in
--	      *mingw* | *cygwin* )
-+	      *mingw* | *cygwin* | *msys* )
- 		# make stdout use "unix" line endings
- 		echo "          setmode(1,_O_BINARY);"
- 		;;
-@@ -5082,7 +5082,7 @@
- {
-     $opt_debug
-     case $host in
--    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+    *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-       # It is impossible to link a dll without this setting, and
-       # we shouldn't force the makefile maintainer to figure out
-       # which system we are compiling for in order to pass an extra
-@@ -5569,7 +5569,7 @@
- 	  ;;
- 	esac
- 	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
-@@ -5589,7 +5589,7 @@
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -5666,7 +5666,7 @@
- 
-       -no-install)
- 	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-+	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
- 	  # The PATH hackery in wrapper scripts is required on Windows
- 	  # and Darwin in order for the loader to find any dlls it needs.
- 	  func_warning "\`-no-install' is ignored for $host"
-@@ -6531,7 +6531,7 @@
- 	  fi
- 	  case "$host" in
- 	    # special handling for platforms with PE-DLLs.
--	    *cygwin* | *mingw* | *cegcc* )
-+	    *cygwin* | *msys* | *mingw* | *cegcc* )
- 	      # Linker will automatically link against shared library if both
- 	      # static and shared are present.  Therefore, ensure we extract
- 	      # symbols from the import library if a shared library is present
-@@ -6675,7 +6675,7 @@
- 	if test -n "$library_names" &&
- 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
- 	  case $host in
--	  *cygwin* | *mingw* | *cegcc*)
-+	  *cygwin* | *msys* | *mingw* | *cegcc*)
- 	      # No point in relinking DLLs because paths are not encoded
- 	      func_append notinst_deplibs " $lib"
- 	      need_relink=no
-@@ -6745,7 +6745,7 @@
- 	    elif test -n "$soname_spec"; then
- 	      # bleh windows
- 	      case $host in
--	      *cygwin* | mingw* | *cegcc*)
-+	      *cygwin* | *msys* | mingw* | *cegcc*)
- 	        func_arith $current - $age
- 		major=$func_arith_result
- 		versuffix="-$major"
-@@ -7605,7 +7605,7 @@
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-+	  *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
-@@ -8118,7 +8118,7 @@
- 
- 	orig_export_symbols=
- 	case $host_os in
--	cygwin* | mingw* | cegcc*)
-+	cygwin* | msys* | mingw* | cegcc*)
- 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
- 	    # exporting using user supplied symfile
- 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-@@ -8674,7 +8674,7 @@
- 
-     prog)
-       case $host in
--	*cygwin*) func_stripname '' '.exe' "$output"
-+	*cygwin* | *msys*) func_stripname '' '.exe' "$output"
- 	          output=$func_stripname_result.exe;;
-       esac
-       test -n "$vinfo" && \
-@@ -8787,7 +8787,7 @@
- 	  esac
- 	fi
- 	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-+	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
-@@ -8865,7 +8865,7 @@
-         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-         wrappers_required=no
-         ;;
--      *cygwin* | *mingw* )
-+      *cygwin* | *msys* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-@@ -9012,14 +9012,14 @@
- 	esac
- 	# test for cygwin because mv fails w/o .exe extensions
- 	case $host in
--	  *cygwin*)
-+	  *cygwin* | *msys*)
- 	    exeext=.exe
- 	    func_stripname '' '.exe' "$outputname"
- 	    outputname=$func_stripname_result ;;
- 	  *) exeext= ;;
- 	esac
- 	case $host in
--	  *cygwin* | *mingw* )
-+	  *cygwin* | *msys* | *mingw* )
- 	    func_dirname_and_basename "$output" "" "."
- 	    output_name=$func_basename_result
- 	    output_path=$func_dirname_result
-@@ -9346,7 +9346,7 @@
- 	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-+	    *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
- 	      # If a -bindir argument was supplied, place the dll there.
- 	      if test "x$bindir" != x ;
- 	      then
 diff -Naur guile-2.0.9-orig/lib/Makefile.am guile-2.0.9/lib/Makefile.am
 --- guile-2.0.9-orig/lib/Makefile.am	2013-04-05 20:54:14.000000000 +0000
 +++ guile-2.0.9/lib/Makefile.am	2013-04-25 07:50:28.660156300 +0000
@@ -909,220 +244,6 @@ diff -Naur guile-2.0.9-orig/m4/dup2.m4 guile-2.0.9/m4/dup2.m4
             linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
                     # closed fd may yield -EBADF instead of -1 / errno=EBADF.
               gl_cv_func_dup2_works="guessing no" ;;
-diff -Naur guile-2.0.9-orig/m4/libtool.m4 guile-2.0.9/m4/libtool.m4
---- guile-2.0.9-orig/m4/libtool.m4	2013-01-28 20:35:00.000000000 +0000
-+++ guile-2.0.9/m4/libtool.m4	2013-04-25 07:55:56.396484400 +0000
-@@ -1616,7 +1616,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
--  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -1863,7 +1863,7 @@
-     lt_cv_dlopen_libs=
-     ;;
- 
--  cygwin*)
-+  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
-     lt_cv_dlopen_libs=
-     ;;
-@@ -2334,7 +2334,7 @@
-   # libtool to hard-code these into programs
-   ;;
- 
--cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-@@ -2366,6 +2366,12 @@
- m4_if([$1], [],[
-       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-       ;;
-+    msys*)
-+      # MSYS DLLs use 'msys-' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+m4_if([$1], [],[
-+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-+      ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-@@ -2400,7 +2406,7 @@
-       # Convert to MSYS style.
-       sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-       ;;
--    cygwin*)
-+    cygwin* | msys*)
-       # Convert to unix form, then to dos form, then back to unix form
-       # but this time dos style (no spaces!) so that the unix form looks
-       # like /cygdrive/c/PROGRA~1:/cygdr...
-@@ -3140,7 +3146,7 @@
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     if test "$GCC" != yes; then
-       reload_cmds=false
-     fi
-@@ -3196,7 +3202,7 @@
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
--cygwin*)
-+cygwin* | msys*)
-   # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-@@ -3506,7 +3512,7 @@
- [lt_cv_sharedlib_from_linklib_cmd='unknown'
- 
- case $host_os in
--cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   # two different shell functions defined in ltmain.sh
-   # decide which to use based on capabilities of $DLLTOOL
-   case `$DLLTOOL --help 2>&1` in
-@@ -3561,7 +3567,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
--*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3636,7 +3642,7 @@
- aix*)
-   symcode='[[BCDT]]'
-   ;;
--cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   symcode='[[ABCDGISTW]]'
-   ;;
- hpux*)
-@@ -3904,7 +3910,7 @@
-     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
--    mingw* | cygwin* | os2* | pw32* | cegcc*)
-+    mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3975,7 +3981,7 @@
- 	  ;;
- 	esac
- 	;;
--      mingw* | cygwin* | os2* | pw32* | cegcc*)
-+      mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
- 	# This hack is so that the source file can tell whether it is being
- 	# built for inclusion in a dll (and should export symbols for example).
- 	m4_if([$1], [GCJ], [],
-@@ -4222,7 +4228,7 @@
-       # PIC is the default for these OSes.
-       ;;
- 
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -4307,7 +4313,7 @@
-       fi
-       ;;
- 
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       m4_if([$1], [GCJ], [],
-@@ -4567,7 +4573,7 @@
-   pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-     ;;
--  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     case $cc_basename in
-     cl*)
-       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-@@ -4625,7 +4631,7 @@
-   extract_expsyms_cmds=
- 
-   case $host_os in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -4740,7 +4746,7 @@
-       fi
-       ;;
- 
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -5113,7 +5119,7 @@
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -6114,7 +6120,7 @@
-         esac
-         ;;
- 
--      cygwin* | mingw* | pw32* | cegcc*)
-+      cygwin* | msys* | mingw* | pw32* | cegcc*)
- 	case $GXX,$cc_basename in
- 	,cl* | no,cl*)
- 	  # Native MSVC
-@@ -7930,7 +7936,7 @@
-       *-*-mingw* ) # actually msys
-         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-         ;;
--      *-*-cygwin* )
-+      *-*-cygwin* | *-*-msys* )
-         lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-         ;;
-       * ) # otherwise, assume *nix
-@@ -7938,12 +7944,12 @@
-         ;;
-     esac
-     ;;
--  *-*-cygwin* )
-+  *-*-cygwin* | *-*-msys* )
-     case $build in
-       *-*-mingw* ) # actually msys
-         lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-         ;;
--      *-*-cygwin* )
-+      *-*-cygwin* | *-*-msys* )
-         lt_cv_to_host_file_cmd=func_convert_file_noop
-         ;;
-       * ) # otherwise, assume *nix
-diff -Naur guile-2.0.9-orig/m4/ltoptions.m4 guile-2.0.9/m4/ltoptions.m4
---- guile-2.0.9-orig/m4/ltoptions.m4	2013-01-28 20:35:01.000000000 +0000
-+++ guile-2.0.9/m4/ltoptions.m4	2013-04-25 07:56:35.746093800 +0000
-@@ -126,7 +126,7 @@
- [enable_win32_dll=yes
- 
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
 diff -Naur guile-2.0.9-orig/m4/malloc.m4 guile-2.0.9/m4/malloc.m4
 --- guile-2.0.9-orig/m4/malloc.m4	2013-02-18 20:37:43.000000000 +0000
 +++ guile-2.0.9/m4/malloc.m4	2013-04-25 07:56:52.291015600 +0000