diff --git a/debian/changelog b/debian/changelog
index a82823e..31cbf77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+supercollider (1:3.4.5-2) testing; urgency=low
+
+  [ Dan Stowell ]
+  * Update rules to set DEB_SRCDIR. Closes #674386
+
+  [ Felipe Sateler ]
+  * Build with gcc 4.6 to avoid an internal compiler error with 4.7
+
+ -- Felipe Sateler <fsateler@debian.org>  Wed, 15 Aug 2012 18:20:51 -0400
+
 supercollider (1:3.4.5-1) unstable; urgency=low
 
   [ Dan Stowell ]
diff --git a/debian/control b/debian/control
index 301b7df..52614eb 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,9 @@ Build-Depends:
  libsndfile1-dev (>= 1.0.16),
  libxt-dev,
  python-all-dev (>= 2.6.6-3~),
- scons (>= 0.96)
+ scons (>= 0.96),
+ gcc-4.6,
+ g++-4.6
 Standards-Version: 3.9.2
 Homepage: http://supercollider.sourceforge.net/
 
diff --git a/debian/rules b/debian/rules
index 618dbbb..455e692 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,16 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/scons.mk
 
-DEB_BUILDDIR=common
+DEB_SRCDIR=common
 
 # Add here any variable or target overrides you need.
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 export CDBS_NO_DOC_SYMLINKING:=1
 
+# G++ 4.7 ICEs, so use 4.6
+CC=gcc-4.6
+CXX=g++-4.6
+
 # Do not enable parallel building: scons cannot handle parallel
 # builds when the chdir option is used in any command
 # DEB_BUILD_PARALLEL = 1