diff -Nru m2vrequantiser-1.1/debian/changelog m2vrequantiser-1.1/debian/changelog
--- m2vrequantiser-1.1/debian/changelog	2012-03-23 08:21:43.000000000 +0000
+++ m2vrequantiser-1.1/debian/changelog	2014-07-11 14:48:47.000000000 +0000
@@ -1,3 +1,16 @@
+m2vrequantiser (1.1-2) unstable; urgency=medium
+
+  * Avoid sscanf() access to argv's 3rd argument when only one
+    is given. (Closes: #715590)
+  * debian/patches/1001-makefile.patch:
+    - Don't append -g -02 to CFLAGS by default, let the build takes it on
+      its own.
+    - Process CPPFLAGS when compiling for hardening.
+  * Set up debhelper 9.
+  * Bump Standards.
+
+ -- Alessio Treglia <alessio@debian.org>  Fri, 11 Jul 2014 15:35:43 +0100
+
 m2vrequantiser (1.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #664979)
diff -Nru m2vrequantiser-1.1/debian/compat m2vrequantiser-1.1/debian/compat
--- m2vrequantiser-1.1/debian/compat	2012-03-23 08:08:13.000000000 +0000
+++ m2vrequantiser-1.1/debian/compat	2014-07-11 14:41:30.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru m2vrequantiser-1.1/debian/control m2vrequantiser-1.1/debian/control
--- m2vrequantiser-1.1/debian/control	2012-03-23 08:25:36.000000000 +0000
+++ m2vrequantiser-1.1/debian/control	2014-07-11 14:48:52.000000000 +0000
@@ -5,9 +5,9 @@
 Uploaders:
  Alessio Treglia <alessio@debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~)
+ debhelper (>= 9~)
 Homepage: https://launchpad.net/m2vrequantiser
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/m2vrequantiser.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/m2vrequantiser.git
 
diff -Nru m2vrequantiser-1.1/debian/patches/1001-makefile.patch m2vrequantiser-1.1/debian/patches/1001-makefile.patch
--- m2vrequantiser-1.1/debian/patches/1001-makefile.patch	2012-03-23 08:35:58.000000000 +0000
+++ m2vrequantiser-1.1/debian/patches/1001-makefile.patch	2014-07-11 14:41:14.000000000 +0000
@@ -2,13 +2,25 @@
 Author: Alessio Treglia <alessio@debian.org>
 Forwarded: no
 ---
- Makefile |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
---- M2VRequantiser-v1.1.orig/Makefile
-+++ M2VRequantiser-v1.1/Makefile
-@@ -17,11 +17,11 @@ M2VRequantiser : $(OBJECTS)
- 	$(CC) $(CFLAGS) -c $<
+--- m2vrequantiser.orig/Makefile
++++ m2vrequantiser/Makefile
+@@ -1,6 +1,6 @@
+ PREFIX    ?= /usr/local
+ CC         = gcc
+-CFLAGS    ?= -O2 -g -funroll-loops -frename-registers
++CFLAGS    += -funroll-loops -frename-registers
+ CFLAGS    += -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
+ CFLAGS    += -Wall
+ OBJECTS    = main.o
+@@ -14,14 +14,14 @@ M2VRequantiser : $(OBJECTS)
+ 	$(CC) $(CFLAGS) $(OBJECTS) $(LDFLAGS) $(LOADLIBES) -o M2VRequantiser
+ 
+ %.o : %.c
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
  
  install:	all
 -	$(INSTALL) -d $(PREFIX)/bin
diff -Nru m2vrequantiser-1.1/debian/patches/1002-argc_sigsegv.patch m2vrequantiser-1.1/debian/patches/1002-argc_sigsegv.patch
--- m2vrequantiser-1.1/debian/patches/1002-argc_sigsegv.patch	1970-01-01 00:00:00.000000000 +0000
+++ m2vrequantiser-1.1/debian/patches/1002-argc_sigsegv.patch	2014-07-11 14:34:35.000000000 +0000
@@ -0,0 +1,18 @@
+Subject: Fix SIGSEGV.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715590
+Forwarded: no
+---
+ main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- m2vrequantiser.orig/main.c
++++ m2vrequantiser/main.c
+@@ -2315,7 +2315,7 @@ int main (int argc, const char * argv[])
+ 	if (argc < 5) { USAGE }
+ 	delta_bright = atoi(argv[4]);
+ #else
+-	if (argc < 2) { USAGE }
++	if (argc < 3) { USAGE }
+ #endif
+ 	fact_x = atof(argv[1]);
+ 	sscanf(argv[2], "%lld", &orim2vsize);
diff -Nru m2vrequantiser-1.1/debian/patches/series m2vrequantiser-1.1/debian/patches/series
--- m2vrequantiser-1.1/debian/patches/series	2012-03-23 08:34:25.000000000 +0000
+++ m2vrequantiser-1.1/debian/patches/series	2014-07-11 14:29:57.000000000 +0000
@@ -1 +1,2 @@
 1001-makefile.patch
+1002-argc_sigsegv.patch