diff --git a/yast2-installation.spec b/yast2-installation.spec
index 90d8148..0760f58 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -1,17 +1,30 @@
 #
-# spec file for package yast2-installation (Version 2.21.22)
+# spec file for package yast2-installation
 #
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
 # norootforbuild
 
-Name:		yast2-installation
-Version:	2.21.22
-Release:	0
 
+Name:           yast2-installation
+Version:        2.21.22
+Release:        0
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-Source0:	yast2-installation-2.21.22.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        yast2-installation-%{version}.tar.bz2
 
-prefix:		/usr
 
 Group:	System/YaST
 License: GPL-2.0+
@@ -133,26 +146,26 @@ System installation code as present on installation media.
 System installation code as present on installation media.
 
 %prep
-%setup -n yast2-installation-2.21.22
+%setup -n yast2-installation-%{version}
 
 %build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
 autoreconf --force --install
 
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 
 %{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
 # so that RPM_OPT_FLAGS check works
 make %{?jobs:-j%jobs} V=1
 
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
     d=${f##*/}
     %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
 done
@@ -201,7 +214,7 @@ rm -rf "$RPM_BUILD_ROOT"
 /usr/share/YaST2/clients/*.ycp
 /usr/share/YaST2/modules/*.ycp
 /usr/share/YaST2/modules/*.ybc
-%{prefix}/share/applications/YaST2/*.desktop
+%{_prefix}/share/applications/YaST2/*.desktop
 /usr/share/autoinstall/modules/*.desktop
 /usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc
 %dir /usr/share/autoinstall
@@ -223,17 +236,17 @@ rm -rf "$RPM_BUILD_ROOT"
 /var/adm/fillup-templates/sysconfig.security-checksig
 
 # programs and scripts
-%{prefix}/lib/YaST2/startup
+%{_prefix}/lib/YaST2/startup
 
 # icewm
 /etc/icewm
 
-%dir %{prefix}/share/doc/packages/yast2-installation
-%{prefix}/share/doc/packages/yast2-installation/COPYING
-%readme %{prefix}/share/doc/packages/yast2-installation/README
+%dir %{_prefix}/share/doc/packages/yast2-installation
+%{_prefix}/share/doc/packages/yast2-installation/COPYING
+%readme %{_prefix}/share/doc/packages/yast2-installation/README
 
 %files devel-doc
 %defattr(-,root,root)
-%doc %{prefix}/share/doc/packages/yast2-installation
-%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
-%exclude %{prefix}/share/doc/packages/yast2-installation/README
+%doc %{_prefix}/share/doc/packages/yast2-installation
+%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING
+%exclude %{_prefix}/share/doc/packages/yast2-installation/README