diff -Nru png23d-1.10/debian/changelog png23d-1.10/debian/changelog
--- png23d-1.10/debian/changelog	2012-01-15 23:30:07.000000000 +0000
+++ png23d-1.10/debian/changelog	2016-01-28 12:00:26.000000000 +0000
@@ -1,8 +1,19 @@
-png23d (1.10-1ubuntu1) precise; urgency=low
+png23d (1.10-1.2) unstable; urgency=medium
 
-  * Add ld_as-needed.patch to fix FTBFS.
+  * Non-maintainer upload.
+  [ Daniel T Chen ]
+  * d/p/ld_as-needed.patch: add ld_as-needed.patch to fix FTBFS
+    (Closes: #812988).
 
- -- Daniel T Chen <crimsun@ubuntu.com>  Sun, 15 Jan 2012 18:30:00 -0500
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 28 Jan 2016 12:46:16 +0100
+
+png23d (1.10-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libpng16, patch from Nobuhiro (Closes: #650567)
+  * Add watchfile from PTS
+
+ -- Tobias Frost <tobi@debian.org>  Thu, 07 Jan 2016 22:42:21 +0100
 
 png23d (1.10-1) unstable; urgency=low
 
diff -Nru png23d-1.10/debian/control png23d-1.10/debian/control
--- png23d-1.10/debian/control	2012-01-15 23:29:29.000000000 +0000
+++ png23d-1.10/debian/control	2011-11-08 08:37:24.000000000 +0000
@@ -1,8 +1,7 @@
 Source: png23d
 Section: graphics
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Vincent Sanders <vince@debian.org>
+Maintainer: Vincent Sanders <vince@debian.org>
 Build-Depends: debhelper (>= 8.0.0), libpng-dev
 Standards-Version: 3.9.2
 Homepage: http://kyllikki.github.com/png23d/
diff -Nru png23d-1.10/debian/patches/ftbfs png23d-1.10/debian/patches/ftbfs
--- png23d-1.10/debian/patches/ftbfs	1970-01-01 00:00:00.000000000 +0000
+++ png23d-1.10/debian/patches/ftbfs	2016-01-07 21:39:12.000000000 +0000
@@ -0,0 +1,35 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ png23d (1.10-1.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- png23d-1.10.orig/bitmap.c
++++ png23d-1.10/bitmap.c
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ #include <png.h>
+ 
diff -Nru png23d-1.10/debian/patches/series png23d-1.10/debian/patches/series
--- png23d-1.10/debian/patches/series	2012-01-15 23:29:32.000000000 +0000
+++ png23d-1.10/debian/patches/series	2016-01-28 11:47:15.000000000 +0000
@@ -1 +1,2 @@
+ftbfs
 ld_as-needed.patch
diff -Nru png23d-1.10/debian/watch png23d-1.10/debian/watch
--- png23d-1.10/debian/watch	1970-01-01 00:00:00.000000000 +0000
+++ png23d-1.10/debian/watch	2016-01-07 21:41:58.000000000 +0000
@@ -0,0 +1,3 @@
+version=3
+https://github.com/kyllikki/png23d/releases \
+.*[^n]/(?:|v|version-|release-|r|REL_|rel-|png23d(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)