diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig
index 8950db70376..d17fb237e66 100644
--- a/srcpkgs/thunderbird/files/mozconfig
+++ b/srcpkgs/thunderbird/files/mozconfig
@@ -10,7 +10,7 @@ ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
-ac_add_options --with-system-png
+# ac_add_options --with-system-png
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 5999a72c17c..34e39b07c4b 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -1,19 +1,17 @@
 # Template build file for 'thunderbird'.
 pkgname=thunderbird
-version=17.0.2
-revision=2
-wrksrc=comm-release
+version=17.0.7
+revision=1
+wrksrc="comm-esr17"
 short_desc="Standalone Mail/News reader"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mozilla.org/thunderbird/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
-checksum=081b53161750a31f9b43d4ba4ccb496c69fdfaa3430f0ce0798cd5fa3036764c
-
-disable_debug=yes
+checksum=682707e21c6ef1ee325983e30a05f254cfe31c98692eb632f3d6ca8f4682eece
 
 hostmakedepends="unzip zip perl python yasm pkg-config"
-makedepends="libjpeg-turbo-devel libpng-devel>=1.6 hunspell-devel
+makedepends="libjpeg-turbo-devel hunspell-devel
  pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel
  gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel
  startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel