diff -Naur guile-1.6-1.6.8.orig/debian/compat guile-1.6-1.6.8.fixed/debian/compat
--- guile-1.6-1.6.8.orig/debian/compat	1970-01-01 02:00:00.000000000 +0200
+++ guile-1.6-1.6.8.fixed/debian/compat	2012-02-21 23:34:25.593829782 +0200
@@ -0,0 +1 @@
+7
diff -Naur guile-1.6-1.6.8.orig/debian/control guile-1.6-1.6.8.fixed/debian/control
--- guile-1.6-1.6.8.orig/debian/control	2012-02-21 21:52:39.781320394 +0200
+++ guile-1.6-1.6.8.fixed/debian/control	2012-02-21 23:34:13.336009530 +0200
@@ -4,7 +4,7 @@
 Maintainer: Rob Browning <rlb@defaultvalue.org>
 Build-Depends: libtool, debhelper (>= 4), libncurses5-dev, libreadline6-dev, libltdl-dev (>= 2.2.6b-1), quilt
 Build-Conflicts: ash (<= 0.3.8-31), slib (<< 3a2-3)
-Standards-Version: 3.2.1.0
+Standards-Version: 3.8.4
 
 Package: guile-1.6
 Section: lisp
diff -Naur guile-1.6-1.6.8.orig/debian/patches/guile-snarf-fix.diff guile-1.6-1.6.8.fixed/debian/patches/guile-snarf-fix.diff
--- guile-1.6-1.6.8.orig/debian/patches/guile-snarf-fix.diff	1970-01-01 02:00:00.000000000 +0200
+++ guile-1.6-1.6.8.fixed/debian/patches/guile-snarf-fix.diff	2012-02-21 23:33:57.476633224 +0200
@@ -0,0 +1,8 @@
+--- a/libguile/guile-snarf-docs.in.orig	2011-06-02 11:49:24.423491408 +0300
++++ b/libguile/guile-snarf-docs.in	2011-06-02 11:49:26.174492567 +0300
+@@ -23,4 +23,4 @@
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
diff -Naur guile-1.6-1.6.8.orig/debian/patches/series guile-1.6-1.6.8.fixed/debian/patches/series
--- guile-1.6-1.6.8.orig/debian/patches/series	2012-02-21 21:52:39.703200781 +0200
+++ guile-1.6-1.6.8.fixed/debian/patches/series	2012-02-21 23:33:57.476633224 +0200
@@ -4,3 +4,4 @@
 find-stack-direction.diff
 ensure-strptime-prototype.diff
 autofiles.diff
+guile-snarf-fix.diff
diff -Naur guile-1.6-1.6.8.orig/debian/patches/use-system-libltdl.diff guile-1.6-1.6.8.fixed/debian/patches/use-system-libltdl.diff
--- guile-1.6-1.6.8.orig/debian/patches/use-system-libltdl.diff	2012-02-21 21:52:39.703200781 +0200
+++ guile-1.6-1.6.8.fixed/debian/patches/use-system-libltdl.diff	2012-02-21 23:33:57.476633224 +0200
@@ -51,3 +51,15 @@
  #endif
  
  #ifdef HAVE_WINSOCK2_H
+@@ -88,8 +88,8 @@
+ {
+ #ifdef DYNAMIC_LINKING
+   /* libtool automagically inserts this variable into your executable... */
+-  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
+-  scm_lt_dlpreload_default (lt_preloaded_symbols);
++  extern const lt_dlsymlist lt_preloaded_symbols[];
++  lt_dlpreload_default (lt_preloaded_symbols);
+ #endif
+   scm_boot_guile (argc, argv, inner_main, 0);
+   return 0; /* never reached */
+
diff -Naur guile-1.6-1.6.8.orig/debian/rules guile-1.6-1.6.8.fixed/debian/rules
--- guile-1.6-1.6.8.orig/debian/rules	2012-02-21 21:52:39.765695220 +0200
+++ guile-1.6-1.6.8.fixed/debian/rules	2012-02-21 23:34:19.711028956 +0200
@@ -14,12 +14,7 @@
 upstream_archive_dir := guile-1.6.8
 
 # Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-export DH_COMPAT := 4
+# export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -283,17 +278,14 @@
 	dh_installman
 #	dh_installcron
 	dh_installinfo
-        # handle http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=337215
-	perl -wpi -e 's/\\Q//gmo; s/\\E//gmo' \
-	  debian/guile-1.6-doc.postinst.debhelper
-	dh_strip
 	dh_link
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
-	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
+	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb