diff -Nru oggvideotools-0.9.1/debian/changelog oggvideotools-0.9.1/debian/changelog
--- oggvideotools-0.9.1/debian/changelog	2016-09-05 16:56:22.000000000 +0000
+++ oggvideotools-0.9.1/debian/changelog	2016-12-03 21:40:18.000000000 +0000
@@ -1,3 +1,12 @@
+oggvideotools (0.9.1-3) unstable; urgency=medium
+
+  * Updated d/copyright file to relect that win32/ no longer is part
+    of the source tarball.
+  * New patch import-cstring.patch to fix build problem after compiler
+    updates.  Patch from Jan Gerber.  Closes: #844858
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 03 Dec 2016 21:40:18 +0000
+
 oggvideotools (0.9.1-2) unstable; urgency=medium
 
   * Add new and missing build dependency libboost-dev.
diff -Nru oggvideotools-0.9.1/debian/copyright oggvideotools-0.9.1/debian/copyright
--- oggvideotools-0.9.1/debian/copyright	2016-02-27 14:02:04.000000000 +0000
+++ oggvideotools-0.9.1/debian/copyright	2016-09-06 04:59:35.000000000 +0000
@@ -27,10 +27,6 @@
 Copyright: 2010, Bjarne Juul Pasgaard <bjvest@users.sourceforge.net>
 License: GPL-2+
 
-Files: win32/*
-Copyright: 88-99, 1987, Free Software Foundation, Inc.
-License: LGPL-2+
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru oggvideotools-0.9.1/debian/copyright.cme oggvideotools-0.9.1/debian/copyright.cme
--- oggvideotools-0.9.1/debian/copyright.cme	2016-02-27 14:02:04.000000000 +0000
+++ oggvideotools-0.9.1/debian/copyright.cme	2016-09-06 05:00:04.000000000 +0000
@@ -52,14 +52,6 @@
 Copyright: 2009, Copyright: See COPYING file that comes with this distribution
 License: GPL-2+
 
-Files: win32/*
-Copyright: 88-99, 1987, Free Software Foundation, Inc.
-License: LGPL-2+
-
-Files: win32/getopt_win.h
-Copyright: 90-94, 96-98, 1989, Free Software Foundation, Inc
-License: LGPL-2+
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -68,12 +60,3 @@
  .
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in '/usr/share/common-licenses/GPL-2'.
-
-License: LGPL-2+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published by the
- Free Software Foundation; version 2 of the License, or (at
- your option) any later version.
- .
- On Debian systems, the complete text of version 2 of the GNU Library
- General Public License can be found in `/usr/share/common-licenses/LGPL-2'.
diff -Nru oggvideotools-0.9.1/debian/patches/import-cstring.patch oggvideotools-0.9.1/debian/patches/import-cstring.patch
--- oggvideotools-0.9.1/debian/patches/import-cstring.patch	1970-01-01 00:00:00.000000000 +0000
+++ oggvideotools-0.9.1/debian/patches/import-cstring.patch	2016-12-03 20:51:25.000000000 +0000
@@ -0,0 +1,10 @@
+--- oggvideotools-0.9.1.orig/src/base/test/decoderTest.cpp
++++ oggvideotools-0.9.1/src/base/test/decoderTest.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include "oggDecoder.h"
+ #include <vector>
++#include <cstring>
+ #include <iostream>
+
+ int main(int argc, char* argv[])
diff -Nru oggvideotools-0.9.1/debian/patches/series oggvideotools-0.9.1/debian/patches/series
--- oggvideotools-0.9.1/debian/patches/series	2016-09-05 10:58:05.000000000 +0000
+++ oggvideotools-0.9.1/debian/patches/series	2016-12-03 20:51:25.000000000 +0000
@@ -3,3 +3,4 @@
 oggThumb-zero-getopt-long.patch
 more-compiler-warnings.patch
 init-for-valgrind.patch
+import-cstring.patch