diff -Nru timidity-2.13.2/debian/changelog timidity-2.13.2/debian/changelog
--- timidity-2.13.2/debian/changelog	2010-06-08 12:33:38.000000000 -0400
+++ timidity-2.13.2/debian/changelog	2011-11-19 23:54:47.000000000 -0500
@@ -1,3 +1,14 @@
+timidity (2.13.2-40) unstable; urgency=low
+
+  * New maintainer (Closes: #585039).
+  * Specify multiarch path to libaudio to fix FTBFS (Closes: #639196,
+    #641415) (LP: #832841).
+  * Bump standards-version to 3.9.2; no changes necessary.
+  * Add lintian override for embedded mikmod copy; I'll deal with this
+    later (opens #649344).
+
+ -- Geoffrey Thomas <geofft@ldpreload.com>  Sat, 19 Nov 2011 23:45:23 -0500
+
 timidity (2.13.2-39) unstable; urgency=low
 
   * Orphan the package.
diff -Nru timidity-2.13.2/debian/control timidity-2.13.2/debian/control
--- timidity-2.13.2/debian/control	2010-06-08 12:34:05.000000000 -0400
+++ timidity-2.13.2/debian/control	2011-11-19 23:57:19.000000000 -0500
@@ -1,9 +1,10 @@
 Source: timidity
 Section: sound
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libesd0-dev, libjack-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), libflac-dev (>= 1.1.4), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, tcl8.4-dev, tk8.4-dev, libgtk2.0-dev, autotools-dev
-Standards-Version: 3.8.3
+Maintainer: Geoffrey Thomas <geofft@ldpreload.com>
+Uploaders: Karl Ramm <kcr@debian.org>
+Build-Depends: debhelper (>= 7), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libesd0-dev, libjack-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), libflac-dev (>= 1.1.4), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, libxaw7-dev, tcl8.4-dev, tk8.4-dev, libgtk2.0-dev, autotools-dev, dpkg-dev (>= 1.16.0)
+Standards-Version: 3.9.2
 Homepage: http://timidity.sourceforge.net/
 
 Package: timidity
@@ -48,7 +49,7 @@
 Section: lisp
 Architecture: all
 Depends: emacsen-common, ${misc:Depends}, timidity (>= ${source:Version})
-Description: An Emacs front end to Timidity++
+Description: Emacs front end to Timidity++
  The timidity.el Emacs-Lisp program is a front-end to the TiMidity++ software-
  only MIDI sequencer and MOD player.  You can play MIDI amd MOD files directly
  from Emacs with this package.
diff -Nru timidity-2.13.2/debian/rules timidity-2.13.2/debian/rules
--- timidity-2.13.2/debian/rules	2009-09-11 03:47:54.000000000 -0400
+++ timidity-2.13.2/debian/rules	2011-08-27 20:40:47.000000000 -0400
@@ -14,6 +14,7 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 CONFFLAGS =
@@ -77,7 +78,8 @@
 	 --with-default-output=default \
 	 --enable-interface=$(interface) \
 	 --enable-dynamic=slang,tcltk,vt100,xskin,gtk \
-	 --enable-server --enable-network --enable-spectrogram --enable-wrd
+	 --enable-server --enable-network --enable-spectrogram --enable-wrd \
+	 --with-nas-library=/usr/lib/$(DEB_HOST_MULTIARCH)/libaudio.so
 	touch doconfigure-stamp
 
 clean:	configure doconfigure
diff -Nru timidity-2.13.2/debian/timidity.lintian timidity-2.13.2/debian/timidity.lintian
--- timidity-2.13.2/debian/timidity.lintian	2008-12-29 04:44:42.000000000 -0500
+++ timidity-2.13.2/debian/timidity.lintian	2011-11-19 23:46:35.000000000 -0500
@@ -1 +1,5 @@
 timidity: image-file-in-usr-lib
+# There's a forked copy of mikmod with the player UI, etc. removed/mangled
+# dating from 2000. It's going to take some effort to even determine if this
+# will work with a modern mikmod... this is tracked in #649344.
+timidity: embedded-library usr/bin/timidity: libmikmod