diff -Nru scons-2.3.0/debian/changelog scons-2.3.0/debian/changelog
--- scons-2.3.0/debian/changelog	2013-05-05 09:48:50.000000000 +0000
+++ scons-2.3.0/debian/changelog	2016-01-15 17:24:13.000000000 +0000
@@ -1,3 +1,9 @@
+scons (2.3.0-2ubuntu1) trusty; urgency=medium
+
+  * Add debian/patches/sconf_streamer_non_unicode.patch (LP: #1524058)
+
+ -- Yury V. Zaytsev <yury@shurup.com>  Tue, 08 Dec 2015 16:08:05 +0100
+
 scons (2.3.0-2) unstable; urgency=low
 
   * Upload to unstable.
diff -Nru scons-2.3.0/debian/control scons-2.3.0/debian/control
--- scons-2.3.0/debian/control	2013-05-05 09:48:50.000000000 +0000
+++ scons-2.3.0/debian/control	2016-01-15 17:24:47.000000000 +0000
@@ -1,7 +1,8 @@
 Source: scons
 Section: devel
 Priority: optional
-Maintainer: Luca Falavigna <dktrkranz@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Luca Falavigna <dktrkranz@debian.org>
 Uploaders: Mark Brown <broonie@debian.org>
 Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~)
 Standards-Version: 3.9.4
diff -Nru scons-2.3.0/debian/patches/sconf_streamer_non_unicode.patch scons-2.3.0/debian/patches/sconf_streamer_non_unicode.patch
--- scons-2.3.0/debian/patches/sconf_streamer_non_unicode.patch	1970-01-01 00:00:00.000000000 +0000
+++ scons-2.3.0/debian/patches/sconf_streamer_non_unicode.patch	2016-01-15 17:24:13.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Fix SConf.Streamer to work with non-unicode input on Python 2.x
+Author: Paweł Tomulik <ptomulik@meil.pw.edu.pl>
+Upstream: https://bitbucket.org/scons/scons/pull-requests/127/fixed-sconfstreamer-to-work-with-non/diff
+
+--- a/engine/SCons/SConf.py
++++ b/engine/SCons/SConf.py
+@@ -180,7 +180,13 @@
+     def write(self, str):
+         if self.orig:
+             self.orig.write(str)
+-        self.s.write(str)
++        try:
++            self.s.write(str)
++        except TypeError as e:
++            if e.message.startswith('unicode argument expected'):
++                self.s.write(str.decode())
++            else:
++                raise
+ 
+     def writelines(self, lines):
+         for l in lines:
diff -Nru scons-2.3.0/debian/patches/series scons-2.3.0/debian/patches/series
--- scons-2.3.0/debian/patches/series	2013-05-05 09:48:50.000000000 +0000
+++ scons-2.3.0/debian/patches/series	2016-01-15 17:24:13.000000000 +0000
@@ -2,3 +2,4 @@
 remove_stale_files.patch
 parallel_build.patch
 manpages.patch
+sconf_streamer_non_unicode.patch