diff -Nru xstarfish-1.1/debian/changelog xstarfish-1.1/debian/changelog
--- xstarfish-1.1/debian/changelog	2011-09-12 08:23:24.000000000 +0000
+++ xstarfish-1.1/debian/changelog	2016-01-06 09:55:22.000000000 +0000
@@ -1,8 +1,12 @@
-xstarfish (1.1-11ubuntu1) oneiric; urgency=low
+xstarfish (1.1-11.1) unstable; urgency=medium
 
-  * Fix build failure with ld --as-needed. LP: #832847.
+  * Non-maintainer upload.
+  * Fix build failure with ld --as-needed. LP: #832847, using patch from doko
+    (Closes: #641274)
+  * Apply patch for libpng transistion, patch from Nobuhiro(Closes: #635704)
+  * Also, change B-D to libpng-dev (Closes: #662570)
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 12 Sep 2011 10:22:33 +0200
+ -- Tobias Frost <tobi@debian.org>  Wed, 06 Jan 2016 10:55:22 +0100
 
 xstarfish (1.1-11) unstable; urgency=low
 
diff -Nru xstarfish-1.1/debian/control xstarfish-1.1/debian/control
--- xstarfish-1.1/debian/control	2010-08-12 04:18:41.000000000 +0000
+++ xstarfish-1.1/debian/control	2016-01-06 09:48:40.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Simon Fondrie-Teitler <simonft@riseup.net>
-Build-Depends: debhelper (>=5), libpng12-dev, libx11-dev, xbitmaps
+Build-Depends: debhelper (>=5), libpng-dev, libx11-dev, xbitmaps
 Standards-Version: 3.9.1
 
 Package: xstarfish
@@ -15,4 +15,4 @@
  XStarfish generates colourful, tiled images for your background using random
  numbers fed through mathematical functions. It does not use source image
  files, so it can generate its images nearly forever without running out of
- material. 
+ material.
diff -Nru xstarfish-1.1/debian/patches/debian-changes-1.1-11.1 xstarfish-1.1/debian/patches/debian-changes-1.1-11.1
--- xstarfish-1.1/debian/patches/debian-changes-1.1-11.1	1970-01-01 00:00:00.000000000 +0000
+++ xstarfish-1.1/debian/patches/debian-changes-1.1-11.1	2016-01-06 09:42:30.000000000 +0000
@@ -0,0 +1,40 @@
+Description: Upstream changes introduced in version 1.1-11.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ xstarfish (1.1-11.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+   * libpng transition.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.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>
+
+--- xstarfish-1.1.orig/unix/makepng.c
++++ xstarfish-1.1/unix/makepng.c
+@@ -79,7 +79,11 @@ void MakePNGFile(StarfishRef tex, const
+ 	if(theInfoPtr)
+ 	{
+ 		/* set up the png error handling. */
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++		if (setjmp(png_jmpbuf((theWritePtr))))
++#else
+ 		if (setjmp(theWritePtr->jmpbuf))
++#endif
+ 		{
+ 			png_destroy_write_struct(&theWritePtr, &theInfoPtr);
+ 			fclose(theFile);
diff -Nru xstarfish-1.1/debian/patches/series xstarfish-1.1/debian/patches/series
--- xstarfish-1.1/debian/patches/series	2011-09-12 08:23:29.000000000 +0000
+++ xstarfish-1.1/debian/patches/series	2016-01-06 09:43:46.000000000 +0000
@@ -1,2 +1,3 @@
 previous-maintainer-changes
 debian-changes-1.1-11ubuntu1
+debian-changes-1.1-11.1