diff --git a/spl-modules.spec.in b/spl-modules.spec.in
index e18a3bfbc42f..7740d9422a84 100644
--- a/spl-modules.spec.in
+++ b/spl-modules.spec.in
@@ -1,179 +1,226 @@
 # The following block is used to allow the source RPM to be rebuilt 
 # against specific kernels.  It is preferable that rpmbuild define the
 # require_kver, require_kdir, require_obj constants for us, but if it does not
 # not we attempt to determine the correct values based on your distro.
 
+# kdir:    Full path to the kernel source headers
+# kobj:    Full path to the kernel build objects
+# kver:    Kernel version
+# kpkg:    Kernel package name
+# kdevpkg: Kernel devel package name
+# kverpkg: Kernel package version
+
 %if %{defined require_kver}
 %define kver %{require_kver}
 %endif
 
 %if %{defined require_kdir}
 %define kdir %{require_kdir}
 %endif
 
 %if %{defined require_kobj}
 %define kobj %{require_kobj}
 %endif
 
-# kdir:    Full path to the kernel source headers
-# kobj:    Full path to the kernel build objects
-# kver:    Kernel version
-# kpkg:    Kernel package name
-# kdevpkg: Kernel devel package name
-# kverpkg: Kernel package version
-
-# SLES*:
-%if %{defined sles_version}
+# SLES 10, SLES 11:
+%if %{defined suse_version}
  %if %{undefined kver}
-  %define klnk           %{_usrsrc}/linux-obj/%{_target_cpu}/%{_target_cpu}
-  %define kver           %((echo X; %{__cat} %{klnk}/.kernelrelease
-                            2>/dev/null) | tail -1)
+  %ifarch ppc64
+   %define kverextra     ppc64
+  %else
+   %define kverextra     default
+  %endif
+
+  %if %{suse_version} >= 1100
+   %define klnk          %{_usrsrc}/linux-obj/%{_target_cpu}/%{kverextra}
+   %define krelease      %{klnk}/include/config/kernel.release
+  %else
+   %define klnk          %{_usrsrc}/linux-obj/%{_target_cpu}/%{kverextra}
+   %define krelease      %{klnk}/.kernelrelease
+  %endif
+
+  %define kver           %((echo X; %{__cat} %{krelease} 2>/dev/null)|tail -1)
+ %endif
+
+ %if %{undefined kverextra}
+  %define kverextra      %(echo %{kver} | cut -f3 -d'-')
  %endif
- %define kpkg            kernel-%{_target_cpu}
- %define kdevpkg         kernel-source kernel-syms
- %define kverpkg         %(echo %{kver} | cut -d'-' -f1-2)
+
+ %define kpkg            kernel-%{kverextra}
+ %define kdevpkg         kernel-source
+ %define kverpkg         %(echo %{kver} | %{__sed} -e 's/-%{kverextra}//g')
+
+ # The kernel and rpm versions do not strictly match under SLES11
+ # e.g. kernel version 2.6.27.19-5 != rpm version 2.6.27.19-5.1
+ %if %{suse_version} >= 1100
+  %define koppkg         >=
+ %else
+  %define koppkg         =
+ %endif
+
  %if %{undefined kdir}
   %define kdir           %{_usrsrc}/linux-%{kverpkg}
  %endif
  %if %{undefined kobj}
-  %define kobj           %{kdir}-obj/%{_target_cpu}/%{_target_cpu}
+  %define kobj           %{kdir}-obj/%{_target_cpu}/%{kverextra}
  %endif
-
-# CHAOS4:
 %else
+
+# CHAOS 4.x:
 %if %{defined ch4}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/kernels/*/include/config
   %define kver           %((echo X; %{__cat} %{klnk}/kernel.release
                             2>/dev/null) | tail -1)
  %endif
  %define kpkg            chaos-kernel
  %define kdevpkg         chaos-kernel-devel
  %define kverpkg         %{kver}
+ %define koppkg          =
  %if %{undefined kdir}
   %define kdir %{_usrsrc}/kernels/%{kver}
  %endif
  %if %{undefined kobj}
   %define kobj           %{kdir}
  %endif
+%else
 
-# RHEL*/Fedora:
+# RHEL 5:
+%if %{defined el5}
+ %if %{undefined kver}
+  %define klnk           %{_usrsrc}/kernels/*/include/config
+  %define kver           %((echo X; %{__cat} %{klnk}/kernel.release
+                            2>/dev/null) | tail -1)
+ %endif
+ %define kpkg            kernel
+ %define kdevpkg         kernel-devel
+ %define kverpkg         %{kver}
+ %define koppkg          =
+ %if %{undefined kdir}
+  %define kdir           %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+ %endif
+ %if %{undefined kobj}
+  %define kobj           %{kdir}
+ %endif
 %else
-%if %{defined fedora} || %{defined rhel}
+
+# Fedora 11:
+%if %{defined fedora}
  %if %{undefined kver}
   %define klnk           %{_usrsrc}/kernels/*/include/config
   %define kver           %((echo X; %{__cat} %{klnk}/kernel.release
                             2>/dev/null) | tail -1)
  %endif
  %define kpkg            kernel
  %define kdevpkg         kernel-devel
- %define kverpkg         %(echo %{kver} | cut -d'.' -f1-7)
+ %define kverpkg         %(echo %{kver} | %{__sed} -e 's/.%{_target_cpu}//g')
+ %define koppkg          =
  %if %{undefined kdir}
   %define kdir           %{_usrsrc}/kernels/%{kver}
  %endif
  %if %{undefined kobj}
   %define kobj           %{kdir}
  %endif
-
 %else
 
 # Unsupported distro:
  %if %{undefined kver}
-  %define kver            X
+  %define kver           X
  %endif
- %define kpkg             kernel
- %define kdevpkg          kernel-devel
- %define kverpkg          %{kver}
+ %define kpkg            kernel
+ %define kdevpkg         kernel-devel
+ %define kverpkg         %{kver}
+ %define koppkg          =
  %if %{undefined kdir}
   %define kdir           %{_usrsrc}/kernels/%{kver}
  %endif
  %if %{undefined kobj}
   %define kobj           %{kdir}
  %endif
 
 %endif
 %endif
 %endif
+%endif
 
 # Distro agnostic:
 %define name             @PACKAGE@-modules
 %define version          @VERSION@
 %define debug_package    %{nil}
 
-
 # The kernel version should only be appended to a binary RPM.  When
 # building a source RPM it must be kernel version agnostic.  This means
 # the source RPM must never specify a required kernel version, but the
 # final RPM should be keyed to the kernel version it was built against.
 %if %{defined build_src_rpm}
 %define release          @SPL_META_RELEASE@
 %define requires         %{kpkg}
 %else
 %define relext           %(echo %{kverpkg} | %{__sed} -e 's/-/_/g')
 %define release          @SPL_META_RELEASE@_%{relext}
-%define requires         %{kpkg} = %{kverpkg}
+%define requires         %{kpkg} %{koppkg} %{kverpkg}
 %endif
 
 Summary:         Solaris Porting Layer Modules
 Group:           Utilities/System
 Name:            %{name}
 Version:         %{version}
 Release:         %{release}
 License:         @LICENSE@
 URL:             git://eris.llnl.gov/spl.git
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 Source:          @PACKAGE@-%{version}.tar.gz
 Requires:        %{requires}
 BuildRequires:   %{kdevpkg}
 
 %description
 The %{name} package contains kernel modules for emulating Solaris style
 primatives in the linux kernel. These include, but are not limited to:
 atomic, condvar, debug, error, memory, kobject, kstat, mutex, rwlock,
 taskq, thread, time, and vnode APIs.
 
 %package devel
 Summary:         Solaris Porting Layer Headers and Symbols
 Group:           Development/Libraries
 Requires:        %{requires}
 BuildRequires:   %{kdevpkg}
 
 %description devel
 The %{name}-devel package contains the header files and Module{s}.symvers
 symbols needed for building additional modules which use %{name}.
 
 %prep
 %setup -n @PACKAGE@-%{version}
 %build
 %configure --with-linux=%{kdir} --with-linux-obj=%{kobj} \
            --with-config=kernel
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
 /lib/modules/*
 
 %files devel
 %defattr(-,root,root)
 %{_prefix}/src/*
 
 %post
 if [ -f /boot/System.map-%{kver} ]; then
 	depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
 else
 	depmod -ae %{kver} || exit 0
 fi
 
 %postun
 if [ -f /boot/System.map-%{kver} ]; then
 	depmod -ae -F /boot/System.map-%{kver} %{kver} || exit 0
 else
 	depmod -ae %{kver} || exit 0
 fi