diff -Nru guile-gnome-platform-2.16.2/debian/changelog guile-gnome-platform-2.16.2/debian/changelog
--- guile-gnome-platform-2.16.2/debian/changelog	2014-02-11 08:59:12.000000000 +0000
+++ guile-gnome-platform-2.16.2/debian/changelog	2014-11-22 15:12:24.000000000 +0000
@@ -1,3 +1,14 @@
+guile-gnome-platform (2.16.2-1.1+rpi1) jessie-staging; urgency=medium
+
+  * Guile 2.0 related fixes taken from 2.16.2-1.1ubuntu1 by Colin Watson
+    + Switch to guile-2.0-dev.
+    + Backport build fix from upstream to use absolute paths and handle
+      GUILE_LOAD_PATH being unset.
+    + Handle the Automake parallel test harness.
+    + Use dh-autoreconf to help apply these changes.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 22 Nov 2014 15:11:51 +0000
+
 guile-gnome-platform (2.16.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru guile-gnome-platform-2.16.2/debian/control guile-gnome-platform-2.16.2/debian/control
--- guile-gnome-platform-2.16.2/debian/control	2012-06-02 14:32:20.000000000 +0000
+++ guile-gnome-platform-2.16.2/debian/control	2014-11-22 15:13:21.000000000 +0000
@@ -6,7 +6,7 @@
 Homepage: http://www.gnu.org/software/guile-gnome/
 Build-Depends: cdbs (>= 0.4.49), debhelper (>> 7),
  automake, libtool, xvfb, xauth, xfonts-base, stx2any,
- guile-1.8-dev, guile-library (>= 0.1.6),
+ guile-2.0-dev, guile-library (>= 0.1.6),
  g-wrap (>= 1.9.14-1), guile-g-wrap (>= 1.9.14-1),
  libgwrap-runtime-dev (>= 1.9.11), guile-cairo-dev (>= 1.4.0),
  libglib2.0-dev (>= 2.12.13), libgtk2.0-dev (>= 2.10.13), libgconf2-dev (>= 2.18.0),
diff -Nru guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch
--- guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch	1970-01-01 00:00:00.000000000 +0000
+++ guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch	2014-11-22 15:10:03.000000000 +0000
@@ -0,0 +1,47 @@
+Description: Handle Automake parallel test harness
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: no
+Last-Update: 2014-03-25
+
+Index: b/glib/test-suite/Makefile.am
+===================================================================
+--- a/glib/test-suite/Makefile.am
++++ b/glib/test-suite/Makefile.am
+@@ -36,7 +36,8 @@
+ gw_module_name = (gnome gw $(wrapset_stem))
+ extra_module_names =
+ wrapset_modules = ($(top_module_name) $(gw_module_name) $(extra_module_names))
+-TESTS_ENVIRONMENT=\
++LOG_COMPILER=\
++	env \
+ 	API_FILE=$(srcdir)/gobject.api \
+ 	DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \
+ 	WRAPSET_MODULES="$(wrapset_modules)" \
+@@ -64,7 +65,7 @@
+ 	$(top_builddir)/dev-environ $(GUILE) --debug -e update-api -s $(srcdir)/wrapset.scm
+ 
+ %.check: %
+-	$(TESTS_ENVIRONMENT) $(srcdir)/$*
++	$(LOG_COMPILER) $(srcdir)/$*
+ 
+ EXTRA_DIST+=gobject.api api.scm wrapset.api wrapset.scm
+ 
+Index: b/tests.mk
+===================================================================
+--- a/tests.mk
++++ b/tests.mk
+@@ -33,12 +33,12 @@
+ WRAPSET_TESTS_ENV = WRAPSET_MODULES="$(wrapset_modules)" WRAPSET_API_FILE=$(srcdir)/wrapset.api
+ DEV_ENV = $(top_builddir)/dev-environ
+ 
+-TESTS_ENVIRONMENT=$(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s
++LOG_COMPILER=env $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s
+ 
+ wrapset.api.update:
+ 	$(WRAPSET_TESTS_ENV) $(DEV_ENV)	$(GUILE) -e update-api -s $(srcdir)/wrapset.scm
+ 
+ %.check: %
+-	$(TESTS_ENVIRONMENT) $(srcdir)/$*
++	$(LOG_COMPILER) $(srcdir)/$*
+ 
+ TESTS = wrapset.scm
diff -Nru guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch
--- guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch	1970-01-01 00:00:00.000000000 +0000
+++ guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch	2014-11-22 15:10:03.000000000 +0000
@@ -0,0 +1,23 @@
+Description: Use absolute paths; handle GUILE_LOAD_PATH being unset
+Author: Andy Wingo <wingo@igalia.com>
+Origin: backport, http://git.savannah.gnu.org/cgit/guile-gnome.git/commit/?id=f37f03bb957701d80a1c3977b3f0f3995b6ec655
+Forwarded: not-needed
+Last-Update: 2014-03-25
+
+Index: b/common.mk
+===================================================================
+--- a/common.mk
++++ b/common.mk
+@@ -39,9 +39,9 @@
+ GUILE_SNARF_CFLAGS = $(DEFS) $(AM_CFLAGS) $(GUILE_CFLAGS) $(G_WRAP_CFLAGS)
+ 
+ PACKAGES = atk cairo corba defs gconf glib gnome-vfs gtk libglade libgnome libgnomecanvas libgnomeui pango
+-SOURCE_GUILE_PATH=$(shell echo $(addprefix $(top_srcdir)/,$(PACKAGES)) | sed -e 's/ /:/g'):$(srcdir)
+-BUILD_GUILE_PATH=$(if $(filter-out $(top_srcdir),$(top_builddir)),$(shell echo -n $(addprefix $(top_builddir)/,$(PACKAGES)): | sed -e 's/ /:/g'),)
+-GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}
++SOURCE_GUILE_PATH=$(shell echo $(addprefix $(abs_top_srcdir)/,$(PACKAGES)) | sed -e 's/ /:/g'):$(srcdir)
++BUILD_GUILE_PATH=$(if $(filter-out $(abs_top_srcdir),$(abs_top_builddir)),$(shell echo -n $(addprefix $(abs_top_builddir)/,$(PACKAGES)): | sed -e 's/ /:/g'),)
++GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}$(if ${GUILE_LOAD_PATH},:${GUILE_LOAD_PATH})
+ export GUILE_LOAD_PATH
+ 
+ .c.x:
diff -Nru guile-gnome-platform-2.16.2/debian/patches/series guile-gnome-platform-2.16.2/debian/patches/series
--- guile-gnome-platform-2.16.2/debian/patches/series	2012-06-02 14:32:20.000000000 +0000
+++ guile-gnome-platform-2.16.2/debian/patches/series	2014-11-22 15:10:03.000000000 +0000
@@ -4,3 +4,5 @@
 fixes/0004-Allow-configuring-guile-and-guile-snarf-executables.patch
 fixes/0005-Fix-configure-s-interpretation-of-disable-Werror.patch
 fixes/0006-Fix-deprecated-includes-of-glib-sub-headers.patch
+fixes/build-absolute-paths.patch
+fixes/automake-parallel-tests.patch
diff -Nru guile-gnome-platform-2.16.2/debian/rules guile-gnome-platform-2.16.2/debian/rules
--- guile-gnome-platform-2.16.2/debian/rules	2014-02-11 08:58:28.000000000 +0000
+++ guile-gnome-platform-2.16.2/debian/rules	2014-11-22 15:10:03.000000000 +0000
@@ -5,8 +5,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/autotools-vars.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror GUILE=guile-1.8
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror GUILE=guile-2.0
 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR)
 
 DEB_MAKE_CHECK_TARGET = check