diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index feeae5e..51dabc3 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -5,13 +5,13 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.6.22
+_icedtea_ver=2.6.25
 #pkgver() {
 #  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
 #    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
 #  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
 #}
-_updatever=261
+_updatever=291
 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
 pkgrel=1
 
@@ -21,7 +21,7 @@ arch=('x86_64')
 url='http://icedtea.classpath.org'
 license=('custom')
 options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'libxtst'
              'alsa-lib' 'giflib' 'libpng>=1.5.7' 'gtk2'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
              'eclipse-ecj' 'pcsclite' 'lksctp-tools')
@@ -42,27 +42,31 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.xz{,.sig}
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
         icedtea-jdk-xattr.diff
-        fix-xattr-include.patch)
+        fix-xattr-include.patch
+        no-sys-sysctl.diff
+        autotools.patch)
 
 # EdDSA key may require `keyserver sks-keyservers.net` in GPG config
 validpgpkeys=('5132579DD1540ED23E04C5A0CFDA0F9B35964222') # Andrew John Hughes
 
 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
 
-sha256sums=('34fa9f3898e72f7ec2e7b67ccd947e1fd9a7a943d1969b0cf24bc56391da33c0'
+sha256sums=('1b2b41fb76ce751ae07d33136324ad923625a6578bc5a8b65b3189b559a9f84f'
             'SKIP'
-            '65fe3b8d22e1bceaf374402346ad4649e149d3b3329c3b0fa2ed0ad9669a1818'
-            'a07a927a03e1e4199c77ef352aaaf6067101d076a1448a930e1ef2654e9185db'
-            '988ee7a724385e482137f3962db151c3e522a94dd6ae7285941a07929868557a'
-            '8cae72b86bcf782506580ab0efa5c1221cb80b967ea432d1ea081e0d557637da'
-            '3719a0a6394e4674008fb2c62f428bcae2e8695a2462cf49efec5d5711f8d112'
-            '9625754a76451e32f6df941c375102cb876737ae607fd76893cb83cfc3657021'
-            'dad4c549767780314f27558873eb12689fecf17aa1ae3792e77924c4350dca43'
+            '993174ab32deb4051f22599c301fe08704f80fcac814f39c7c1eb84ddc353a64'
+            'b7d750b22135079a76f9282044b9520a411ef51345cfddb7d2816d389c837cd2'
+            'e2521f4d636287925dd5916249380a63f90250a41d81e5944b65b9cd55576c95'
+            'c40eda9cbebefacb346bb44bd08e6eb89d1185e90efc6f4862cf612fe9a2a92f'
+            'b60b68748a7250649307d5a8b3353eb1ba13ede215cb1be89b84b76c87e12648'
+            '739d911279086d06f35eb6154a09bf4aa9f8dd647c304bfeec61db076b1c1114'
+            '8ffa8283c12d42342e38339f124d37cddaf4581be95e70ff8ed1ddfc94524c7f'
             'efad74bd98d9eb72b080a3e08f5b17118e05372d22e3aa3bc0bd1686aa71361c'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             '8da7248a72c60f4cb82c33712bdd8ce8f25b0cd147816efb7112f18a752fcabd'
-            '9a48d91af72d28d7f0fca8ea6f5e42085d7c877c7141a7d895331ab1f5882086')
+            '9a48d91af72d28d7f0fca8ea6f5e42085d7c877c7141a7d895331ab1f5882086'
+            '7150371f3021f31088a2744d7e9b0c2c1f1b26bc6db6507dbebc6d591f82f0b6'
+            '653f2bc55c426260e8fa3ba6ba0c0908375ff165e114387649c09a7f20f67188')
 
 noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
            icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -87,6 +91,7 @@ prepare() {
 
   cd "${srcdir}/icedtea-${_icedtea_ver}"
   patch -Np1 -i ../fix-xattr-include.patch
+  patch -Np1 -i ../autotools.patch
   ./autogen.sh
 }
 
@@ -98,7 +103,8 @@ build() {
 
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
                                patches/openjdk7_nonreparenting-wm.diff \
-                               patches/icedtea-jdk-xattr.diff"
+                               patches/icedtea-jdk-xattr.diff \
+                               patches/no-sys-sysctl.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
@@ -106,7 +112,7 @@ build() {
      BOOTSTRAPOPT="--disable-bootstrap"
   fi
 
-  export EXTRA_CFLAGS="$CFLAGS $CPPFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+  export EXTRA_CFLAGS="$CFLAGS $CPPFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow -fcommon"
   export EXTRA_LDFLAGS="$LDFLAGS"
 
   export PATH="${srcdir}/apache-ant-${_antver}/bin:$PATH"
diff --git a/trunk/autotools.patch b/trunk/autotools.patch
new file mode 100644
index 0000000..a9ae67f
--- /dev/null
+++ b/trunk/autotools.patch
@@ -0,0 +1,31 @@
+diff --git a/autogen.sh b/autogen.sh
+index 8537f67..c1bc22d 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -11,7 +11,7 @@ for AUTOCONF in autoconf autoconf259; do
+         AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #        echo ${AUTOCONF_VERSION}
+         case ${AUTOCONF_VERSION} in
+-            2.59* | 2.6[0-9]* )
++            2.59* | 2.[6-9][0-9]*)
+                 HAVE_AUTOCONF=true
+                 break;
+                 ;;
+@@ -28,7 +28,7 @@ for AUTOHEADER in autoheader autoheader259; do
+         AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #        echo ${AUTOHEADER_VERSION}
+         case ${AUTOHEADER_VERSION} in
+-            2.59* | 2.6[0-9]* )
++            2.59* | 2.[6-9][0-9]*)
+                 HAVE_AUTOHEADER=true
+                 break;
+                 ;;
+@@ -45,7 +45,7 @@ for AUTORECONF in autoreconf; do
+         AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #        echo ${AUTORECONF_VERSION}
+         case ${AUTORECONF_VERSION} in
+-            2.59* | 2.6[0-9]* )
++            2.59* | 2.[6-9][0-9]*)
+                 HAVE_AUTORECONF=true
+                 break;
+                 ;;
diff --git a/trunk/no-sys-sysctl.diff b/trunk/no-sys-sysctl.diff
new file mode 100644
index 0000000..8c347c7
--- /dev/null
+++ b/trunk/no-sys-sysctl.diff
@@ -0,0 +1,20 @@
+--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+@@ -43,7 +43,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #endif
+ 
+ #include "jvm.h"
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+@@ -41,7 +41,6 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+