diff -Nru sslsniff-0.8/debian/changelog sslsniff-0.8/debian/changelog
--- sslsniff-0.8/debian/changelog	2014-04-29 09:16:40.000000000 +0000
+++ sslsniff-0.8/debian/changelog	2014-08-06 15:38:40.000000000 +0000
@@ -1,14 +1,10 @@
-sslsniff (0.8-4.1build2) utopic; urgency=high
+sslsniff (0.8-4.2) unstable; urgency=high
 
-  * No change rebuild against boost1.55.
+  * Non-maintainer upload.
+  * Add debian/patches/02-fix-compatibility-with-gcc49.patch
+    to fix FTFBS with gcc-4.9 (Closes: #746915)
 
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 29 Apr 2014 10:16:40 +0100
-
-sslsniff (0.8-4.1build1) trusty; urgency=low
-
-  * No change rebuild for Boost 1.54 transition.
-
- -- Dmitrijs Ledkovs <xnox@ubuntu.com>  Tue, 22 Oct 2013 18:08:41 +0100
+ -- Sophie Brun <sophie@freexian.com>  Wed, 06 Aug 2014 17:06:53 +0200
 
 sslsniff (0.8-4.1) unstable; urgency=low
 
diff -Nru sslsniff-0.8/debian/control sslsniff-0.8/debian/control
--- sslsniff-0.8/debian/control	2013-10-22 17:08:43.000000000 +0000
+++ sslsniff-0.8/debian/control	2014-08-06 15:38:40.000000000 +0000
@@ -1,8 +1,7 @@
 Source: sslsniff
 Section: admin
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Pierre Chifflier <pollux@debian.org>
+Maintainer: Pierre Chifflier <pollux@debian.org>
 Build-Depends: debhelper (>= 7),
     autotools-dev,
     libssl-dev,
diff -Nru sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch
--- sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch	1970-01-01 00:00:00.000000000 +0000
+++ sslsniff-0.8/debian/patches/02-fix-compatibility-with-gcc49.patch	2014-08-06 15:46:18.000000000 +0000
@@ -0,0 +1,59 @@
+Description: Fix failure to build with GCC 4.9
+ gcc-4.9 doesn't like the conflict between two variables named
+ "error", so rename one of them to avoid the conflict.
+Author: Sophie Brun <sophie@freexian.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746915
+Last-Update: 2014-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/SSLConnectionManager.cpp
++++ b/SSLConnectionManager.cpp
+@@ -95,13 +95,13 @@ void SSLConnectionManager::interceptUpda
+   } catch (SSLConnectionError &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errortext = errorStream.str();
++    Logger::logError(errortext);
+   } catch (FirefoxUpdateException &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errortext = errorStream.str();
++    Logger::logError(errortext);
+   }
+ }
+ 
+@@ -120,13 +120,13 @@ void SSLConnectionManager::interceptAddo
+   } catch (SSLConnectionError &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errortext = errorStream.str();
++    Logger::logError(errortext);
+   } catch (FirefoxUpdateException &error) {
+     std::stringstream errorStream;
+     errorStream << "Got exception: " << error.what();
+-    std::string error = errorStream.str();    
+-    Logger::logError(error);
++    std::string errortext = errorStream.str();
++    Logger::logError(errortext);
+   }
+ }
+ 
+@@ -151,9 +151,9 @@ void SSLConnectionManager::interceptSSL(
+     } catch (SSLConnectionError &error) {
+       std::stringstream errorStream;
+       errorStream << "Got exception: " << error.what();
+-      std::string error = errorStream.str();
++      std::string errortext = errorStream.str();
+ 
+-      Logger::logError(error);
++      Logger::logError(errortext);
+     }
+   }
+ }
diff -Nru sslsniff-0.8/debian/patches/series sslsniff-0.8/debian/patches/series
--- sslsniff-0.8/debian/patches/series	2012-01-03 08:35:15.000000000 +0000
+++ sslsniff-0.8/debian/patches/series	2014-08-06 15:38:40.000000000 +0000
@@ -1 +1,2 @@
 01-fix-compatibility-with-boost-1.48.patch
+02-fix-compatibility-with-gcc49.patch