diff --git a/.cvsignore b/.cvsignore
index 6fff6a4..cf80685 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
 cramfs-1.1.tar.gz
 floppy-0.12.tar.gz
 kbdrate.tar.gz
-util-linux-2.13-pre1.tar.bz2
+util-linux-2.13-pre2.tar.bz2
diff --git a/sources b/sources
index 99a73b2..f3772b9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 d3912b9f7bf745fbfea68f6a9b9de30f  cramfs-1.1.tar.gz
 7d3ac81855e26687dada6a31d2677875  floppy-0.12.tar.gz
 555e4bd2a23347fddac4268cbf4e1fe4  kbdrate.tar.gz
-d65154c41657f7bcb1b2025cdbe588a7  util-linux-2.13-pre1.tar.bz2
+9df13e6a02ed4292966693533ae768aa  util-linux-2.13-pre2.tar.bz2
diff --git a/util-linux-2.13-moretc.patch b/util-linux-2.13-moretc.patch
index 34a5fae..d30b625 100644
--- a/util-linux-2.13-moretc.patch
+++ b/util-linux-2.13-moretc.patch
@@ -1,11 +1,11 @@
---- util-linux-2.13-pre1/text-utils/Makefile.am.moretc	2005-08-01 20:11:07.000000000 +0200
-+++ util-linux-2.13-pre1/text-utils/Makefile.am	2005-08-15 13:36:12.000000000 +0200
+--- util-linux-2.13-pre2/text-utils/Makefile.am.moretc	2005-08-17 10:40:44.000000000 +0200
++++ util-linux-2.13-pre2/text-utils/Makefile.am	2005-08-17 10:41:52.000000000 +0200
 @@ -7,16 +7,13 @@
  man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
  
  if HAVE_NCURSES
 -bin_PROGRAMS = more
- usrbin_PROGRAMS += ul pg
+ usrbinexec_PROGRAMS += ul pg
 -more_LDADD = -lncurses
  pg_LDADD = -lncurses
  ul_LDADD = -lncurses
@@ -19,9 +19,8 @@
  man_MANS += more.1
  endif
 -endif
-\ No newline at end of file
---- util-linux-2.13-pre1/text-utils/more.c.moretc	2005-07-28 23:49:31.000000000 +0200
-+++ util-linux-2.13-pre1/text-utils/more.c	2005-08-15 13:40:55.000000000 +0200
+--- util-linux-2.13-pre2/text-utils/more.c.moretc	2005-07-28 23:49:31.000000000 +0200
++++ util-linux-2.13-pre2/text-utils/more.c	2005-08-17 10:40:23.000000000 +0200
 @@ -59,6 +59,8 @@
  #include "nls.h"
  #include "widechar.h"
diff --git a/util-linux.spec b/util-linux.spec
index c79ba3e..bbdd35c 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -28,7 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-root
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.1.pre1
+Release: 0.2.pre2
 License: distributable
 Group: System Environment/Base
 
@@ -46,8 +46,8 @@ BuildRequires: e2fsprogs-devel >= 1.36
 BuildRequires: audit-libs-devel
 
 ### Sources
-# TODO [stable]: s/2.13-pre1/%{version}/
-Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre1.tar.bz2
+# TODO [stable]: s/2.13-pre2/%{version}/
+Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre2.tar.bz2
 Source1: util-linux-selinux.pamd
 Source2: util-linux-chsh-chfn.pamd
 Source8: nologin.c
@@ -150,9 +150,10 @@ Patch204: util-linux-2.12p-mount-ocfs2.patch
 Patch205: util-linux-2.12p-execl.patch
 # deprecated the arch command (for compatibility only)
 Patch206: util-linux-2.13-arch.patch
+
 # upstream mistakes
 Patch207: util-linux-2.13-agetty-man.patch
-Patch208: util-linux-2.13-init.patch
+Patch208: util-linux-2.13-usrsbin.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -167,7 +168,7 @@ program.
 
 %prep
 # TODO [stable]: remove -n
-%setup -q -a 10 -a 11 -a 12 -n util-linux-2.13-pre1
+%setup -q -a 10 -a 11 -a 12 -n util-linux-2.13-pre2
 
 %patch1 -p1 -b .moretc
 %patch70 -p1
@@ -238,9 +239,13 @@ autoconf
 %define _prefix	""
 
 # configure
-export CFLAGS="%{make_cflags} $RPM_OPT_FLAGS" %{?_smp_mflags}
+# note: we disable tty group (USE_TTY_GROUP) in Makefiles to prevent call chgrp 
+# during the "make install". But we define -DUSE_TTY_GROUP that enable tty groups in
+# *.c files only.
+export CFLAGS="%{make_cflags} -DUSE_TTY_GROUP $RPM_OPT_FLAGS" %{?_smp_mflags}
 %configure \
 	--disable-wall \
+	--disable-use-tty-group \
 	--enable-partx \
 	--enable-login-utils \
 	--enable-kill \
@@ -379,7 +384,6 @@ rm -f $RPM_BUILD_ROOT/sbin/{hwclock,clock} $RPM_BUILD_ROOT%{_mandir}/man8/hwcloc
 %endif
 %ifarch s390 s390x
 rm -f $RPM_BUILD_ROOT/usr/{bin,sbin}/{fdformat,tunelp,floppy} $RPM_BUILD_ROOT%{_mandir}/man8/{fdformat,tunelp,floppy}.8*
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/fdprm
 %endif
 
 # deprecated commands
@@ -449,9 +453,6 @@ fi
 /bin/more
 /bin/kill
 
-%ifnarch s390 s390x
-%config %{_sysconfdir}/fdprm
-%endif
 %config %{_sysconfdir}/pam.d/chfn
 %config %{_sysconfdir}/pam.d/chsh
 %config %{_sysconfdir}/pam.d/login
@@ -638,7 +639,7 @@ fi
 /sbin/losetup
 
 %changelog
-* Tue Aug 16 2005 Karel Zak <kzak@redhat.com> 2.13-0.1.pre1
+* Tue Aug 16 2005 Karel Zak <kzak@redhat.com> 2.13-0.2.pre2
 - /usr/share/misc/getopt/* -move-> /usr/share/doc/util-linux-2.13/getopt-*
 - the arch command marked as deprecated
 - removed: elvtune, rescuept and setfdprm