diff --git a/glibc.spec b/glibc.spec
index 7f2cf07..9d964dd 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -8,12 +8,9 @@
 # example: build a arm cross-platform glibc package with soft floating point support:
 #rpmbuild -ba --define='cross_target_cpu arm' --define='softfloat 1' glibc.spec
 
-%define kheaders_ver %{?KERNEL_VER}%{?KERNEL_TARGET}
-##% define kheaders_append
-%define kheaders_dir %{_prefix}/src/linux-%{kheaders_ver}/usr/include
 %define glibc_headers_dir %{_builddir}/%{name}-%{version}/linux-headers/include
 %define majver %(echo %version | cut -d. -f1-2)
-%define minver %(echo %version | cut -d. -f3)
+#%define minver %(echo %version | cut -d. -f3)
 %define enablekernel 2.6.16
 
 %if "%{?build_doc}" == ""
@@ -101,17 +98,17 @@
 %define build_selinux 0
 %endif
 
-%if "%{?KERNEL_VER}" == ""
-   %define KERNEL_VER             %(uname -r | sed "s|\\([0-9.]*\\).*|\\1|" )
-%endif
+#% if "%{?KERNEL_VER}" == ""
+#   % define KERNEL_VER             %(uname -r | sed "s|\\([0-9.]*\\).*|\\1|" )
+#% endif
 
 %if "%{?KERNEL_TARGET}" == ""
    %define KERNEL_TARGET          %(uname -r | sed "s|[0-9.]*\\(.*\\)|\\1|" )
 %endif
 
 Name:          glibc
-Version:       2.19
-Release:       4mamba
+Version:       2.21
+Release:       1mamba
 Summary:       The GNU libc libraries
 Group:         System/Libraries
 Vendor:        openmamba
@@ -405,9 +402,17 @@ esac
 
 # prepare kernel headers for platform
 mkdir -p %{glibc_headers_dir}
-cp -af %{kheaders_dir}/* %{glibc_headers_dir}
-#cp -af %{kheaders_dir}/$platform_includes %{glibc_headers_dir}/$platform_includes
-#ln -sf $platform_includes %{glibc_headers_dir}/asm
+
+if  [ -e /usr/src/linux-%{KERNEL_VERSION}%{KERNEL_TARGET}/usr/include/linux/version.h ]; then
+   cp -af /usr/src/linux-%{KERNEL_VERSION}%{KERNEL_TARGET}/usr/include/* %{glibc_headers_dir}
+elif [ -e /usr/src/linux-%{KERNEL_TARGET}/usr/include/linux/version.h ]; then
+   cp -af /usr/src/linux-%{KERNEL_TARGET}/usr/include/* %{glibc_headers_dir}
+elif [ -e /usr/src/linux/usr/include/linux/version.h ]; then
+   cp -af /usr/src/linux/usr/include/* %{glibc_headers_dir}
+else
+   echo "ERROR: can't find suitable kernel headers; aborting."
+   exit 1
+fi
 
 function build_glibc() {
    local builddir="$1"; shift
@@ -494,10 +499,10 @@ function build_glibc() {
      %if "%{?stage1}" != "1"
         --host=%{_target_platform} \
      %endif
-        --with-binutils=%{_prefix}/bin \
 	    $CONFIG_OPTS \
 	    CFLAGS=\"$buildflags\ -Wl,--build-id\"
 
+#        --with-binutils=%{_prefix}/bin \
 #        CC=%{buildcc} \
 #        CXX=%{buildcxx} \
 #        %if "%{_target_platform}" != "%{_host}"
@@ -899,6 +904,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Feb 09 2015 Automatic Build System <autodist@mambasoft.it> 2.21-1mamba
+- automatic version update by autodist
+
+* Mon Sep 08 2014 Automatic Build System <autodist@mambasoft.it> 2.20-1mamba
+- automatic version update by autodist
+
 * Sat Aug 23 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.19-4mamba
 - timezone: remove post script to avoid messing /etc/localtime and /etc/timezone
 - x86_64: remove nscd and memusagestat to hopefully silent multiling warning about missing 32bit libs