diff --git a/yast2-reipl-2.18.0.tar.bz2 b/yast2-reipl-2.18.0.tar.bz2
deleted file mode 100644
index 27b0125..0000000
--- a/yast2-reipl-2.18.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d142cf2c023205f6afae4bd3812f9fa4d241f762bf7596272f3d78276a0a91f
-size 92057
diff --git a/yast2-reipl-2.21.0.tar.bz2 b/yast2-reipl-2.21.0.tar.bz2
new file mode 100644
index 0000000..92de97e
--- /dev/null
+++ b/yast2-reipl-2.21.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e10d0548c6cdbfcef3638a1fcc749c90cd7bebdd211ee47be766ee80718de18
+size 92211
diff --git a/yast2-reipl.changes b/yast2-reipl.changes
index baae602..befb286 100644
--- a/yast2-reipl.changes
+++ b/yast2-reipl.changes
@@ -1,9 +1,37 @@
+-------------------------------------------------------------------
+Mon Sep 19 14:51:54 CEST 2011 - visnov@suse.cz
+
+- remove dependency on Wizard_hw
+- 2.21.0 
+
+-------------------------------------------------------------------
+Fri Aug  5 12:34:45 CEST 2011 - tgoettlicher@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Thu Aug  4 14:54:45 CEST 2011 - jsrain@suse.cz
+
+- fixed categories in the .desktop-file (bnc#607047)
+
+-------------------------------------------------------------------
+Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
+
+- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
+  where root privileges are needed, removed X-KDE-SubstituteUID key 
+  (bnc#540627)
+
 -------------------------------------------------------------------
 Mon Apr 20 12:01:39 CEST 2009 - jsrain@suse.cz
 
 - fixed handling of more than 26 disks (bnc #492326)
 - 2.18.0
 
+-------------------------------------------------------------------
+Thu Apr 08 09:43:39 CEST 2009 - jsrain@suse.cz
+
+- fixed reboot after installation into LVM (bnc#592838)
+
 -------------------------------------------------------------------
 Mon Feb  9 09:38:05 CET 2009 - hare@suse.de
 
diff --git a/yast2-reipl.spec b/yast2-reipl.spec
index c9a1374..25d783a 100644
--- a/yast2-reipl.spec
+++ b/yast2-reipl.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package yast2-reipl (Version 2.18.0)
+# spec file for package yast2-reipl
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -19,39 +19,51 @@
 
 
 Name:           yast2-reipl
-Version:        2.18.0
-Release:        1
-License:        GPL v2 only; GPL v2 or later
-Group:          System/YaST
+Version:        2.21.0
+Release:        0
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-reipl-2.18.0.tar.bz2
+Source0:        yast2-reipl-2.21.0.tar.bz2
+
 Prefix:         /usr
-BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-storage yast2-testsuite
-Requires:       yast2 yast2-storage yast2-bootloader
-PreReq:         %fillup_prereq
-BuildArch:      noarch
-Summary:        YaST2 - IPL loader
+
 Group:          System/YaST
+License:        GPL v2 only GPL v2 or later
+BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-storage yast2-testsuite
+
+Requires:       yast2 yast2-storage yast2-bootloader
+
 PreReq:         %fillup_prereq
+
+BuildArch:      noarch
+
+Summary:        YaST2 - IPL loader
+
+Group:          System/YaST
+
+PreReq:         %fillup_prereq
+
 Summary:        YaST2 - IPL loader
 
 %description
 Module for loading IPL from running system on S/390
 
-
-
 %prep
-%setup -n yast2-reipl-2.18.0
+%setup -n yast2-reipl-2.21.0
 
 %build
 %{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}
-make %{?jobs:-j%jobs}
+# 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"
@@ -81,25 +93,5 @@ rm -rf "$RPM_BUILD_ROOT"
 %doc %{prefix}/share/doc/packages/yast2-reipl/*
 %doc %{prefix}/share/doc/packages/yast2-reipl/COPYING
 %readme %{prefix}/share/doc/packages/yast2-reipl/README
+
 %changelog
-* Mon Apr 20 2009 jsrain@suse.cz
-- fixed handling of more than 26 disks (bnc #492326)
-- 2.18.0
-* Mon Feb 09 2009 hare@suse.de
-- Final fix for reboot (bnc#471522)
-* Fri Feb 06 2009 jsrain@suse.cz
-- fixed rebooting (bnc #471522)
-- 2.17.3
-* Fri Oct 31 2008 jsrain@suse.cz
-- do not rely on bootloader module being initialized (bnc #440261)
-- 2.17.2
-* Mon Oct 27 2008 jsrain@suse.cz
-- added more verbose logging
-- 2.17.1
-* Thu Sep 11 2008 locilka@suse.cz
-- Added reipl_finish to be called from installation.
-- Added reipl_bootloader_finish to be called from bootloader.
-- Fixed help texts - one gettext message for one <p>...</p>.
-- 2.17.0
-* Thu Sep 11 2008 uli@suse.de
-- Initial version