diff -Nru snd-11.7/debian/changelog snd-11.7/debian/changelog
--- snd-11.7/debian/changelog	2011-08-30 19:11:48.000000000 +0000
+++ snd-11.7/debian/changelog	2011-09-19 00:06:08.000000000 +0000
@@ -1,3 +1,10 @@
+snd (11.7-1ubuntu1) oneiric; urgency=low
+
+  * Update 00-makefile.diff to link libs correctly. Fixes FTBFS.
+    (LP: #832789)
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sun, 18 Sep 2011 20:05:51 -0400
+
 snd (11.7-1) unstable; urgency=low
   
   * Team upload.
diff -Nru snd-11.7/debian/control snd-11.7/debian/control
--- snd-11.7/debian/control	2011-08-30 19:11:48.000000000 +0000
+++ snd-11.7/debian/control	2011-09-19 00:04:55.000000000 +0000
@@ -1,7 +1,8 @@
 Source: snd
 Section: sound
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: Alessio Treglia <alessio@debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  ladspa-sdk,
diff -Nru snd-11.7/debian/patches/00-makefile.diff snd-11.7/debian/patches/00-makefile.diff
--- snd-11.7/debian/patches/00-makefile.diff	2011-08-30 18:35:36.000000000 +0000
+++ snd-11.7/debian/patches/00-makefile.diff	2011-09-19 00:05:48.000000000 +0000
@@ -6,9 +6,20 @@
  makefile.in |   28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
---- snd.orig/makefile.in
-+++ snd/makefile.in
-@@ -182,13 +182,13 @@ audinfo: $(SNDLIB_HEADERS) $(S7_HEADERS)
+Index: snd-11.7/makefile.in
+===================================================================
+--- snd-11.7.orig/makefile.in	2011-09-18 20:05:10.000000000 -0400
++++ snd-11.7/makefile.in	2011-09-18 20:05:45.000000000 -0400
+@@ -96,7 +96,7 @@
+ main_target: @MAKE_TARGET@
+ 
+ snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(MOTIF_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(FAM_LIB) $(GMP_LIBS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(MOTIF_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(FAM_LIB) $(GMP_LIBS) $(LIBS) -ldl
+ 
+ xm: 	xen.h mus-config.h $(S7_HEADERS)
+ 	$(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(MOTIF_FLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS)
+@@ -182,13 +182,13 @@
  	$(CC) $(LDFLAGS) $(CFLAGS) headers.o io.o audio.o sound.o audinfo.o -o audinfo $(JACK_LIBS) $(AUDIO_LIB) $(LIBS)
  
  install: snd
@@ -29,7 +40,7 @@
  
  uninstall:
  	rm -f ${bindir}/snd
-@@ -196,13 +196,13 @@ uninstall:
+@@ -196,13 +196,13 @@
  	for f in ${SND_SCRIPTS};  do rm -f ${pkgdatadir}/$${f}; done
  
  install-strip: snd