diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 4275039..1264c1f 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,34 +1,40 @@
            SPELL=glibc
 if  [  "$GLIBC_NPTL"  =  "y"  ];  then
          VERSION=2.7
- HEADERS_VERSION=2.6.23.1
+ HEADERS_VERSION=2.6.25
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 case "${SMGL_COMPAT_ARCHS[1]}" in
   ia32)
-         SOURCE3=linux-headers-${HEADERS_VERSION}-i386.tar.bz2
-    SOURCE3_HASH=sha512:8860505c6d1b32b0f3f1180f648da65c3fc0a91b696e13ae9198a87dbfc2ea6e29eca471628237540857a993d43977cb3e5d794abb77bf07e6fa7bc0d4a76d12
+         SOURCE3=linux-headers-${HEADERS_VERSION}-x86.tar.bz2
+         SOURCE6=${SOURCE3}.sig
+     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
   ;;
   x86_64)
 	 SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2
-    SOURCE3_HASH=sha512:122eba0147cbd1e6eb6dedc3701d7118851e192a8d6189bbb95ed1822b637239b99abe80322368c1039e747d1129f0571014557b2d4775bc94f024a58991353f
+         SOURCE6=${SOURCE3}.sig
+     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
   ;;
   ppc)
 	 SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2
-    SOURCE3_HASH=sha512:1e64989ce33eba084f6a612c2d798bae070b8dd42ef5cf4cf127a9c28645082b3d170026aa03de48ed0bbfd99942c38e6e28e3c58756b254ae960c9b6b13a9b5
+         SOURCE6=${SOURCE3}.sig
+     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
   ;;
   alpha)
          SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2
-    SOURCE3_HASH=sha512:002a7d1003eedc257c5be00970f61667cc6e328f6ee9d20572f755f74e0498193042e0a0a3d4ba0751f8481a682be090e358edb3167b211c8fc5c1c7ff69d81b
+         SOURCE6=${SOURCE3}.sig
+     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
   ;;
   sparc)
     if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]
     then
          SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2
-    SOURCE3_HASH=sha512:d7e04e212ad1dc0605bf5d77cde8d150d0961c8a72c012bf9679115af993d857a9760a3ad54f207c4126dd4228882b60d553095cb59a00c390339b36dba9c4a3
+         SOURCE6=${SOURCE3}.sig
+     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
     else
          SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2
-    SOURCE3_HASH=sha512:5e398a9ccf5b19ce2ea910002e9ac4d054c90b5b7cb54edab97634da0f34002056e1d1b0dd02cc623557b32422fae286905bb60be327d5e4912e75b00e10660d
+         SOURCE6=${SOURCE3}.sig
+     SOURCE3_GPG="gurus.gpg:${SOURCE6}"
     fi
   ;;
   *)
@@ -39,16 +45,17 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
 esac
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-  SOURCE3_URL[0]=http://dmlb2000.homelinux.org/pub/kernel-headers/$SOURCE3
+  SOURCE3_URL[0]=http://ryuji.shlrm.org/kernel-headers/$SOURCE3
+  SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
   if [ "$GLIBC_USEIDN" = "y" ]; then
          SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
          SOURCE5=$SOURCE4.sig
   SOURCE4_URL[0]=$GNU_URL/$SPELL/$SOURCE4
   SOURCE5_URL[0]=${SOURCE4_URL[0]}.sig
-     SOURCE4_GPG=gnu.gpg:$SOURCE4.sig:UPSTREAM_KEY
+     SOURCE4_GPG="gnu.gpg:$SOURCE4.sig:UPSTREAM_KEY"
   SOURCE5_IGNORE=signature
   fi
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+      SOURCE_GPG="gnu.gpg:$SOURCE.sig:UPSTREAM_KEY"
   SOURCE2_IGNORE=signature
       PATCHLEVEL=1
 else
@@ -64,9 +71,9 @@ else
   SOURCE3_URL[0]=$GNU_URL/$SPELL/$SOURCE3
   SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
   SOURCE5_URL[0]=http://download.sourcemage.org/mirror/$SOURCE5
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+      SOURCE_GPG="gnu.gpg:$SOURCE.sig:UPSTREAM_KEY"
   SOURCE2_IGNORE=signature
-     SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
+     SOURCE3_GPG="gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY"
   SOURCE4_IGNORE=signature
     SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
       PATCHLEVEL=1
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 6f12619..f03f8a1 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2008-07-26 Elisamuel Resto <ryuji@sourcemage.org>
+	* DETAILS: updated linux-headers tarballs to 2.6.25; use guru GPG sigs
+
 2008-04-10 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Depend on autoconf for rebuilding configure
 	* PRE_BUILD: Apply gcc43.patch to configure.in