diff -Nru mustang-3.2.1/debian/changelog mustang-3.2.1/debian/changelog
--- mustang-3.2.1/debian/changelog	2012-04-03 20:21:51.000000000 +0000
+++ mustang-3.2.1/debian/changelog	2012-04-22 16:42:09.000000000 +0000
@@ -1,3 +1,12 @@
+mustang (3.2.1-3) unstable; urgency=low
+
+  * debian/upstream:
+     - Use BibTeX friendly formating of authors
+  * debian/patches/gcc-4.7.patch: Fix build issue with gcc-4.7
+    Closes: #667293
+
+ -- Andreas Tille <tille@debian.org>  Sun, 22 Apr 2012 18:18:34 +0200
+
 mustang (3.2.1-2) unstable; urgency=low
 
   [ Charles Plessy ]
diff -Nru mustang-3.2.1/debian/patches/gcc-4.7.patch mustang-3.2.1/debian/patches/gcc-4.7.patch
--- mustang-3.2.1/debian/patches/gcc-4.7.patch	1970-01-01 00:00:00.000000000 +0000
+++ mustang-3.2.1/debian/patches/gcc-4.7.patch	2012-04-22 16:38:48.000000000 +0000
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille@debian.org>
+Date: Sun, 22 Apr 2012 18:06:41 +0200
+Bug-Closed: http://bugs.debian.org/667293
+Description: Build with g++ version 4.7
+ Followed hint given at
+   http://gcc.gnu.org/gcc-4.7/porting_to.html
+
+--- MUSTANG_v3.2.1.orig/src/superpose_on_core_2.cpp
++++ MUSTANG_v3.2.1/src/superpose_on_core_2.cpp
+@@ -44,6 +44,8 @@
+ using std::ifstream ;
+ using std::ofstream ;
+ 
++#include <unistd.h>
++
+ #include "macros.h"
+ #include "globals.h"
+ #include "alloc_routines.h"
diff -Nru mustang-3.2.1/debian/patches/series mustang-3.2.1/debian/patches/series
--- mustang-3.2.1/debian/patches/series	2009-10-07 06:17:51.000000000 +0000
+++ mustang-3.2.1/debian/patches/series	2012-04-22 16:33:23.000000000 +0000
@@ -1 +1,2 @@
 03-test_zf-cchh.patch
+gcc-4.7.patch
diff -Nru mustang-3.2.1/debian/upstream mustang-3.2.1/debian/upstream
--- mustang-3.2.1/debian/upstream	2012-04-03 19:48:46.000000000 +0000
+++ mustang-3.2.1/debian/upstream	2012-04-22 16:30:51.000000000 +0000
@@ -2,7 +2,7 @@
 Homepage: http://www.cs.mu.oz.au/~arun/mustang/
 Name: MUSTANG
 Reference:
- Author: Arun S. Konagurthu, James C. Whisstock, Peter J. Stuckey and Arthur M. Lesk
+ Author: Arun S. Konagurthu and James C. Whisstock and Peter J. Stuckey and Arthur M. Lesk
  Title: >
   MUSTANG: A multiple structural alignment algorithm
  Journal: >