diff --git a/kmodtool-kmodtool b/kmodtool-kmodtool
index 59ef201..b8aa050 100644
--- a/kmodtool-kmodtool
+++ b/kmodtool-kmodtool
@@ -68,73 +68,73 @@ rpmbuild --define "_sourcedir %{_sourcedir}" \\\
 -bs --nodeps %{_specdir}/%{name}.spec ; \\\
 ln -s \$(ls \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/) \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/${kmodname}-kmod.latest
 
-%package -n akmod-${kmodname}
-Summary:	Akmod package for ${kmodname} kernel module(s) 
-Group: 		System Environment/Kernel
-Requires:   kmodtool
-Requires: 	akmods
+%package       -n akmod-${kmodname}
+Summary:          Akmod package for ${kmodname} kernel module(s)
+Group:            System Environment/Kernel
+Requires:         kmodtool
+Requires:         akmods
 %{?AkmodsBuildRequires:Requires: %{AkmodsBuildRequires}}
 # same requires and provides as a kmods package would have
-Requires: 	${kmodname}-kmod-common >= %{?epoch:%{epoch}:}%{version}
-Provides: 	${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:         ${kmodname}-kmod-common >= %{?epoch:%{epoch}:}%{version}
+Provides:         ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
 EOF
 
-	if [[ ${obsolete_name} ]]; then
-		echo "Provides:   akmod-${obsolete_name} = ${obsolete_version}"
-		echo "Obsoletes:  akmod-${obsolete_name} < ${obsolete_version}"
+	if [[ ${obsolete_name} ]] ; then
+		echo "Provides:         akmod-${obsolete_name} = ${obsolete_version}"
+		echo "Obsoletes:        akmod-${obsolete_name} < ${obsolete_version}"
 	fi
 
 	cat <<EOF
 
-%description -n akmod-${kmodname}
+%description   -n akmod-${kmodname}
 This package provides the akmod package for the ${kmodname} kernel modules.
 
-%posttrans -n akmod-${kmodname}
+%posttrans     -n akmod-${kmodname}
 nohup /usr/sbin/akmods --from-akmod-posttrans --akmod ${kmodname} &> /dev/null &
 
-%files -n akmod-${kmodname}
+%files         -n akmod-${kmodname}
 %defattr(-,root,root,-)
 %{_usrsrc}/akmods/*
-
 EOF
 }
 
 print_akmodmeta ()
 {
-		cat <<EOF
-%package      -n kmod-${kmodname}
-Summary:         Metapackage which tracks in ${kmodname} kernel module for newest kernel${dashvariant}
-Group:           System Environment/Kernel
-
-Provides:        ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:        kmod-${kmodname}-xen = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:        kmod-${kmodname}-smp = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:        kmod-${kmodname}-PAE = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:        akmod-${kmodname} = %{?epoch:%{epoch}:}%{version}-%{release}
+	cat <<EOF
+
+%package       -n kmod-${kmodname}
+Summary:          Metapackage which tracks in ${kmodname} kernel module for newest kernel${dashvariant}
+Group:            System Environment/Kernel
+
+Provides:         ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:         kmod-${kmodname}-xen = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:         kmod-${kmodname}-smp = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:         kmod-${kmodname}-PAE = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:         akmod-${kmodname} = %{?epoch:%{epoch}:}%{version}-%{release}
 EOF
 
-	if [[ ${obsolete_name} ]]; then
-		echo "Provides:        kmod-${obsolete_name} = ${obsolete_version}"
-		echo "Obsoletes:       kmod-${obsolete_name} < ${obsolete_version}"
+	if [[ ${obsolete_name} ]] ; then
+		echo "Provides:         kmod-${obsolete_name} = ${obsolete_version}"
+		echo "Obsoletes:        kmod-${obsolete_name} < ${obsolete_version}"
 	fi
-cat <<EOF
+	cat <<EOF
 
-%description  -n kmod-${kmodname}${dashvariant}
+%description   -n kmod-${kmodname}${dashvariant}
 This is a meta-package without payload which sole purpose is to require the
 ${kmodname} kernel module(s) for the newest kernel${dashvariant},
 to make sure you get it together with a new kernel.
 
-%files        -n kmod-${kmodname}${dashvariant}
+%files         -n kmod-${kmodname}${dashvariant}
 %defattr(644,root,root,755)
 EOF
 }
 
 print_rpmtemplate_per_kmodpkg ()
 {
-	if [[ "${1}" == "--custom" ]]; then
+	if [[ "${1}" == "--custom" ]] ; then
 		shift
 		local customkernel=true
-	elif [[ "${1}" == "--redhat" ]]; then
+	elif [[ "${1}" == "--redhat" ]] ; then
 		# this is needed for akmods
 		shift
 		local redhatkernel=true
@@ -159,43 +159,43 @@ Requires(post):   %{?_prefix_usr}/sbin/depmod
 Requires(postun): %{?_prefix_usr}/sbin/depmod
 EOF
 
-	if [[ ${obsolete_name} ]]; then
-		echo "Provides:        kmod-${obsolete_name}-${kernel_uname_r} = ${obsolete_version}"
-		echo "Obsoletes:       kmod-${obsolete_name}-${kernel_uname_r} < ${obsolete_version}"
+	if [[ ${obsolete_name} ]] ; then
+		echo
+		echo "Provides:         kmod-${obsolete_name}-${kernel_uname_r} = ${obsolete_version}"
+		echo "Obsoletes:        kmod-${obsolete_name}-${kernel_uname_r} < ${obsolete_version}"
 	fi
 
 	# second part
-	if [[ ! "${customkernel}" ]]; then
-	     cat <<EOF
+	if [[ ! "${customkernel}" ]] ; then
+		cat <<EOF
+
 Requires:         kernel-uname-r = ${kernel_uname_r}
-BuildRequires:	  kernel-devel-uname-r = ${kernel_uname_r}
+BuildRequires:    kernel-devel-uname-r = ${kernel_uname_r}
 %post          -n kmod-${kmodname}-${kernel_uname_r}
 %{?_prefix_usr}/sbin/depmod -aeF /boot/System.map-${kernel_uname_r} ${kernel_uname_r} > /dev/null || :
 %postun        -n kmod-${kmodname}-${kernel_uname_r}
-%{?_prefix_usr}/sbin/depmod  -aF /boot/System.map-${kernel_uname_r} ${kernel_uname_r} &> /dev/null || :
-
+%{?_prefix_usr}/sbin/depmod -aF /boot/System.map-${kernel_uname_r} ${kernel_uname_r} &> /dev/null || :
 EOF
 	else
-	  cat <<EOF
+		cat <<EOF
+
 %post          -n kmod-${kmodname}-${kernel_uname_r}
-[[ "$(uname -r)" == "${kernel_uname_r}"  ]] && %{?_prefix_usr}/sbin/depmod -a > /dev/null || :
+[[ "\$(uname -r)" == "${kernel_uname_r}"  ]] && %{?_prefix_usr}/sbin/depmod -a > /dev/null || :
 %postun        -n kmod-${kmodname}-${kernel_uname_r}
-[[ "$(uname -r)" == "${kernel_uname_r}"  ]] && %{?_prefix_usr}/sbin/depmod -a > /dev/null || :
-
+[[ "\$(uname -r)" == "${kernel_uname_r}"  ]] && %{?_prefix_usr}/sbin/depmod -a > /dev/null || :
 EOF
 	fi
 
-  # third part
+	# third part
 	cat <<EOF
-%description  -n kmod-${kmodname}-${kernel_uname_r}
+
+%description   -n kmod-${kmodname}-${kernel_uname_r}
 This package provides the ${kmodname} kernel modules built for the Linux
 kernel ${kernel_uname_r} for the %{_target_cpu} family of processors.
-%files        -n kmod-${kmodname}-${kernel_uname_r}
+%files         -n kmod-${kmodname}-${kernel_uname_r}
 %defattr(644,root,root,755)
 %dir ${usr_lib_modules}/${kernel_uname_r}/extra
 ${usr_lib_modules}/${kernel_uname_r}/extra/${kmodname}/
-
-
 EOF
 }
 
@@ -205,27 +205,28 @@ print_rpmtemplate_kmodmetapkg ()
 		local kernel_variant="${2:+-${2}}"
 
 		cat <<EOF
-%package      -n kmod-${kmodname}${kernel_variant}
-Summary:         Metapackage which tracks in ${kmodname} kernel module for newest kernel${kernel_variant}
-Group:           System Environment/Kernel
 
-Provides:        ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:        kmod-${kmodname}-${kernel_uname_r} >= %{?epoch:%{epoch}:}%{version}-%{release}
+%package       -n kmod-${kmodname}${kernel_variant}
+Summary:          Metapackage which tracks in ${kmodname} kernel module for newest kernel${kernel_variant}
+Group:            System Environment/Kernel
+
+Provides:         ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:         kmod-${kmodname}-${kernel_uname_r} >= %{?epoch:%{epoch}:}%{version}-%{release}
 EOF
-	
-		if [[ ${obsolete_name} ]]; then
-			echo "Provides:        kmod-${obsolete_name}${kernel_variant} = ${obsolete_version}"
-			echo "Obsoletes:       kmod-${obsolete_name}${kernel_variant} < ${obsolete_version}"
+
+		if [[ ${obsolete_name} ]] ; then
+			echo "Provides:         kmod-${obsolete_name}${kernel_variant} = ${obsolete_version}"
+			echo "Obsoletes:        kmod-${obsolete_name}${kernel_variant} < ${obsolete_version}"
 		fi
 
 		cat <<EOF
 
-%description  -n kmod-${kmodname}${kernel_variant}
+%description   -n kmod-${kmodname}${kernel_variant}
 This is a meta-package without payload which sole purpose is to require the
 ${kmodname} kernel module(s) for the newest kernel${kernel_variant}.
 to make sure you get it together with a new kernel.
 
-%files        -n kmod-${kmodname}${kernel_variant}
+%files         -n kmod-${kmodname}${kernel_variant}
 %defattr(644,root,root,755)
 
 
@@ -236,14 +237,14 @@ print_customrpmtemplate ()
 {
 	for kernel in ${1}
 	do
-		if 	[[ -e "/usr/src/kernels/${kernel}" ]] ; then
+		if [[ -e "/usr/src/kernels/${kernel}" ]] ; then
 			# this looks like a Fedora/RH kernel -- print a normal template (which includes the proper BR) and be happy :)
 			kernel_versions="${kernel_versions}${kernel}___%{_usrsrc}/kernels/${kernel} "
 
 			# parse kernel versions string and print template
 			local kernel_verrelarch=${kernel%%${kernels_known_variants}}
 			print_rpmtemplate_per_kmodpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
-		elif [[ -e "${usr_lib_modules}"/"${kernel}"/build/Makefile ]] ; then 
+		elif [[ -e "${usr_lib_modules}"/"${kernel}"/build/Makefile ]] ; then
 			# likely a user-build-kernel with available buildfiles
 			# fixme: we should check if uname from Makefile is the same as ${kernel}
 
@@ -275,7 +276,7 @@ print_rpmtemplate ()
 
 		local kernel_verrelarch=${kernel%%${kernels_known_variants}}
 
-		# create metapackage 
+		# create metapackage
 		print_rpmtemplate_kmodmetapkg ${kernel} ${kernel##${kernel_verrelarch}}
 
 		# create package
@@ -288,7 +289,7 @@ myprog_help ()
 	echo "Usage: $(basename ${0}) [OPTIONS]"
 	echo $'\n'"Creates a template to be used during kmod building"
 	echo $'\n'"Available options:"
-	# FIXME	echo " --datadir <dir>     -- look for our shared files in <dir>"
+	# FIXME echo " --datadir <dir>     -- look for our shared files in <dir>"
 	echo " --filterfile <file>  -- filter the results with grep --file <file>"
 	echo " --for-kernels <list> -- created templates only for these kernels"
 	echo " --kmodname <file>    -- name of the kmod (required)"
@@ -303,7 +304,7 @@ while [ "${1}" ] ; do
 			shift
 			if [[ ! "${1}" ]] ; then
 				error_out 2 "Please provide path to a filter-file together with --filterfile" >&2
-			elif [[ ! -e "${1}" ]]; then	
+			elif [[ ! -e "${1}" ]] ; then
 				error_out 2 "Filterfile ${1} not found" >&2
 			fi
 			filterfile="${1}"
@@ -313,7 +314,7 @@ while [ "${1}" ] ; do
 			shift
 			if [[ ! "${1}" ]] ; then
 				error_out 2 "Please provide the name of the kmod together with --kmodname" >&2
-	 	    fi
+			fi
 			# strip pending -kmod
 			kmodname="${1%%-kmod}"
 			shift
@@ -322,7 +323,7 @@ while [ "${1}" ] ; do
 			shift
 			if [[ ! "${1}" ]] ; then
 				error_out 2 "Please provide the name of the repo together with --repo" >&2
-	 	    fi
+			fi
 			repo=${1}
 			shift
 			;;
@@ -330,7 +331,7 @@ while [ "${1}" ] ; do
 			shift
 			if [[ ! "${1}" ]] ; then
 				error_out 2 "Please provide the name of the kmod together with --kmodname" >&2
-	 		fi
+			fi
 			for_kernels="${1}"
 			shift
 			;;
@@ -342,7 +343,7 @@ while [ "${1}" ] ; do
 			shift
 			if [[ ! "${1}" ]] ; then
 				error_out 2 "Please provide the name of the kmod to obsolte together with --obsolete-name" >&2
-	 		fi
+			fi
 			obsolete_name="${1}"
 			shift
 			;;
@@ -350,7 +351,7 @@ while [ "${1}" ] ; do
 			shift
 			if [[ ! "${1}" ]] ; then
 				error_out 2 "Please provide the version of the kmod to obsolte together with --obsolete-version" >&2
-	 		fi
+			fi
 			obsolete_version="${1}"
 			shift
 			;;
@@ -393,30 +394,30 @@ else
 	usr_lib_modules=/lib/modules
 fi
 
-if [[ -e ./kmodtool-kernel-variants ]]; then
+if [[ -e ./kmodtool-kernel-variants ]] ; then
 	kernels_known_variants="$(cat ./kmodtool-kernel-variants)"
 elif [[ -e /usr/share/kmodtool/kernel-variants ]] ; then
 	kernels_known_variants="$(cat /usr/share/kmodtool/kernel-variants)"
 else
-	error_out 2  "Could not find /usr/share/kmodtool/kernel-variants"	
+	error_out 2  "Could not find /usr/share/kmodtool/kernel-variants"
 fi
 
 # general sanity checks
-if [[ ! "${target}" ]]; then
-		error_out 2 "please pass target arch with --target"
-elif [[ ! "${kmodname}" ]]; then
-		error_out 2 "please pass kmodname with --kmodname"
+if [[ ! "${target}" ]] ; then
+	error_out 2 "please pass target arch with --target"
+elif [[ ! "${kmodname}" ]] ; then
+	error_out 2 "please pass kmodname with --kmodname"
 elif [[ ! "${kernels_known_variants}" ]] ; then
-		error_out 2 "could not determine known variants"
+	error_out 2 "could not determine known variants"
 elif ( [[ "${obsolete_name}" ]] && [[ ! "${obsolete_version}" ]] ) ||  ( [[ ! "${obsolete_name}" ]] && [[ "${obsolete_version}" ]] ) ; then
-		error_out 2 "you need to provide both --obsolete-name and --obsolete-version"
+	error_out 2 "you need to provide both --obsolete-name and --obsolete-version"
 fi
 
 # go
-if [[ "${for_kernels}" ]]; then
+if [[ "${for_kernels}" ]] ; then
 	# this is easy:
 	print_customrpmtemplate "${for_kernels}"
-elif [[ "${build_kernels}" == "akmod" ]]; then
+elif [[ "${build_kernels}" == "akmod" ]] ; then
 	# do only a akmod package
 	print_akmodtemplate
 	print_akmodmeta
@@ -424,7 +425,7 @@ else
 	# seems we are on out own to decide for which kernels to build
 
 	# we need more sanity checks in this case
-	if [[ ! "${repo}" ]]; then
+	if [[ ! "${repo}" ]] ; then
 		error_out 2 "please provide repo name with --repo"
 	elif ! $(which buildsys-build-${repo}-kerneldevpkgs &> /dev/null) ; then
 		error_out 2 "buildsys-build-${repo}-kerneldevpkgs not found"
@@ -433,20 +434,20 @@ else
 	# call buildsys-build-${repo}-kerneldevpkgs to get the list of kernels
 	cmdoptions="--target ${target}"
 
-	# filterfile to filter list of kernels?	
+	# filterfile to filter list of kernels?
 	if [[ "${filterfile}" ]] ; then
-		 cmdoptions="${cmdoptions} --filterfile ${filterfile}"
+		cmdoptions="${cmdoptions} --filterfile ${filterfile}"
 	fi
 
 	kernel_versions_to_build_for="$(buildsys-build-${repo}-kerneldevpkgs --${build_kernels} ${cmdoptions})"
 	returncode=$?
-	if (( ${returncode} != 0 )); then
+	if (( ${returncode} != 0 )) ; then
 		error_out 2 "buildsys-build-${repo}-kerneldevpkgs failed: $(buildsys-build-${repo}-kerneldevpkgs --${build_kernels} ${cmdoptions})"
 	fi
 
-	if [[ "${build_kernels}" == "current" ]] && [[ ! "${noakmod}" ]]; then
+	if [[ "${build_kernels}" == "current" ]] && [[ ! "${noakmod}" ]] ; then
 		print_akmodtemplate
 	fi
 
-	print_rpmtemplate 
+	print_rpmtemplate
 fi