diff -Nru ebook-speaker-2.0/debian/changelog ebook-speaker-2.0/debian/changelog
--- ebook-speaker-2.0/debian/changelog	2012-03-20 01:43:29.000000000 +0000
+++ ebook-speaker-2.0/debian/changelog	2012-03-03 20:37:01.000000000 +0000
@@ -1,8 +1,16 @@
-ebook-speaker (2.0-1build1) precise; urgency=low
+ebook-speaker (2.0-2) unstable; urgency=low
 
-  * No change rebuild for libzip transition
+  [ Samuel Thibault ]
+  * debian/patches/ncx.patch: New patch to fix parsing ncx files
+    (Closes: Bug#660302).
+  * control: Bump Standards-Version to 3.9.3 (no changes).
+  * debian/patches/realname.patch: New patch to fix realname to really return
+    a valid string.
+
+  [ Paul Gevers ]
+  * Update d/copyright file with new format URL
 
- -- Scott Kitterman <scott@kitterman.com>  Mon, 19 Mar 2012 21:43:07 -0400
+ -- Paul Gevers <paul@climbing.nl>  Sat, 03 Mar 2012 19:55:24 +0100
 
 ebook-speaker (2.0-1) unstable; urgency=low
 
diff -Nru ebook-speaker-2.0/debian/control ebook-speaker-2.0/debian/control
--- ebook-speaker-2.0/debian/control	2011-12-07 21:32:05.000000000 +0000
+++ ebook-speaker-2.0/debian/control	2012-03-03 20:36:40.000000000 +0000
@@ -12,7 +12,7 @@
 	       libmagic-dev,
 	       hardening-wrapper
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=pkg-a11y/ebook-speaker.git
 Vcs-Git: git://git.debian.org/pkg-a11y/ebook-speaker.git
 Homepage: http://web.inter.nl.net/users/lemmensj/
diff -Nru ebook-speaker-2.0/debian/copyright ebook-speaker-2.0/debian/copyright
--- ebook-speaker-2.0/debian/copyright	2011-09-18 12:57:44.000000000 +0000
+++ ebook-speaker-2.0/debian/copyright	2012-03-03 18:58:30.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: eBook-speaker
 Source: http://web.inter.nl.net/users/lemmensj/
 Upstream-Contact: Jos Lemmens <jos@jlemmens.nl>
diff -Nru ebook-speaker-2.0/debian/patches/ncx.patch ebook-speaker-2.0/debian/patches/ncx.patch
--- ebook-speaker-2.0/debian/patches/ncx.patch	1970-01-01 00:00:00.000000000 +0000
+++ ebook-speaker-2.0/debian/patches/ncx.patch	2012-03-03 18:29:08.000000000 +0000
@@ -0,0 +1,78 @@
+Index: ebook-speaker/eBook-speaker.c
+===================================================================
+--- ebook-speaker.orig/eBook-speaker.c	2012-02-26 20:22:29.900527674 +0100
++++ ebook-speaker/eBook-speaker.c	2012-02-26 20:24:01.378846878 +0100
+@@ -335,7 +335,7 @@ void get_bookmark ()
+ 
+ void get_attributes (char *p)
+ {
+-   char name[1024], *value, *begin;
++   char buffer[1024], *name, *value, *begin;
+    int break2;
+ 
+    *attribute.class = 0;
+@@ -371,6 +371,8 @@ void get_attributes (char *p)
+       p++;
+    } // while
+    break2 = 0;
++   strncpy (buffer, p, 1000);
++   p = buffer;
+    while (1)
+    {
+       while (isspace (*++p))
+@@ -380,7 +382,7 @@ void get_attributes (char *p)
+             break2 = 1;
+             break;
+          } // if
+-         if (p - begin > 1000)
++         if (p - buffer > 1000)
+          {
+             *p = 0;
+             break2 = 1;
+@@ -389,7 +391,7 @@ void get_attributes (char *p)
+       } // while
+       if (break2)
+         break;
+-      strncpy (name, p, 1000);
++      name = p;
+       p = name;
+       while (! isspace (*p) && *p != '=')
+       {
+@@ -398,7 +400,7 @@ void get_attributes (char *p)
+             break2 = 1;
+             break;
+          } // if
+-         if (p - begin > 1000)
++         if (p - buffer > 1000)
+          {
+             *p = 0;
+             break2 = 1;
+@@ -416,7 +418,7 @@ void get_attributes (char *p)
+             break2 = 1;
+             break;
+          } // if
+-         if (p - begin > 1000)
++         if (p - buffer > 1000)
+          {
+             *p = 0;
+             break2 = 1;
+@@ -432,7 +434,7 @@ void get_attributes (char *p)
+       p = value;
+       while (*p != '"' && *p != '>' && *p != '?')
+       {
+-         if (p - begin > 1000)
++         if (p - buffer > 1000)
+          {
+             *p = 0;
+             break2 = 1;
+@@ -1034,7 +1036,9 @@ void read_eBook_struct ()
+       {
+          if (*attribute.toc)
+          {
+-            read_ncx (attribute.toc);
++            char *id = strdup(attribute.toc);
++            read_ncx (id);
++            free(id);
+ // if toc is nevertheless empty, read opf
+             if (total_items == 0)
+                read_opf (opf);
diff -Nru ebook-speaker-2.0/debian/patches/realname.patch ebook-speaker-2.0/debian/patches/realname.patch
--- ebook-speaker-2.0/debian/patches/realname.patch	1970-01-01 00:00:00.000000000 +0000
+++ ebook-speaker-2.0/debian/patches/realname.patch	2012-03-03 18:29:08.000000000 +0000
@@ -0,0 +1,20 @@
+diff --git a/eBook-speaker.c b/eBook-speaker.c
+index 2ba53aa..1081002 100644
+--- a/eBook-speaker.c
++++ b/eBook-speaker.c
+@@ -178,12 +178,13 @@ char *realname (char *name)
+    {
+       if (strcasecmp (dirent->d_name, name) == 0)
+       {
++         char *newname = strdup(dirent->d_name);
+          closedir (dir);
+-         return dirent->d_name;
++         return newname;
+       } // if
+    } // while
+    closedir (dir);
+-   return name;
++   return strdup(name);
+ } // realname
+ 
+ double read_time (char *p)
diff -Nru ebook-speaker-2.0/debian/patches/series ebook-speaker-2.0/debian/patches/series
--- ebook-speaker-2.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ ebook-speaker-2.0/debian/patches/series	2012-03-03 18:29:08.000000000 +0000
@@ -0,0 +1,2 @@
+ncx.patch
+realname.patch