diff --git a/.cvsignore b/.cvsignore
index 7db3f01..68b3a95 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ shadow-4.0.16.tar.bz2
 shadow-4.0.16-nscd.c
 shadow-4.0.17.tar.bz2
 shadow-4.0.17-login.defs
+shadow-4.0.18.1.tar.bz2
diff --git a/shadow-utils.spec b/shadow-utils.spec
index 6153c15..aee576c 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -4,8 +4,8 @@
 
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
-Version: 4.0.17
-Release: 7%{?dist}
+Version: 4.0.18.1
+Release: 1%{?dist}
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -18,9 +18,8 @@ Patch2: shadow-4.0.11.1-vipw.patch
 Patch3: shadow-4.0.14-goodname.patch
 Patch4: shadow-4.0.13-newgrpPwd.patch
 Patch5: shadow-4.0.16-lOption.patch
-Patch6: shadow-4.0.17-UID_GID.patch
-Patch7: shadow-4.0.17-notInheritFd.patch
-Patch8: shadow-4.0.17-exitValues.patch
+Patch6: shadow-4.0.17-notInheritFd.patch
+Patch7: shadow-4.0.17-exitValues.patch
 
 License: BSD
 Group: System Environment/Base
@@ -52,13 +51,12 @@ are used for managing group accounts.
 %patch3 -p1 -b .goodname
 %patch4 -p1 -b .newgrpPwd
 %patch5 -p1 -b .lOption
-%patch6 -p1 -b .UID_GID
 
 #replace whole file
 cp %{SOURCE3} lib/nscd.c
-%patch7 -p1 -b .notInheritFd
+%patch6 -p1 -b .notInheritFd
 
-%patch8 -p1 -b .exitValues
+%patch7 -p1 -b .exitValues
 
 rm po/*.gmo
 rm po/stamp-po
@@ -213,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Wed Nov 01 2006 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-1
+- upgrade
+
 * Wed Oct 25 2006 Peter Vrabec <pvrabec@redhat.com> 2:4.0.17-7
 - add dist-tag
 
diff --git a/sources b/sources
index c9954fd..9a578ee 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 7ebc6a5cd0207246a6b2c9ebf9b30391  shadow-4.0.16-nscd.c
-bc5972a195290533b4c0576276056ed9  shadow-4.0.17.tar.bz2
 7edc1f4d9c1f734b7cb3fd40570e04db  shadow-4.0.17-login.defs
+e7751d46ecf219c07ae0b028ab3335c6  shadow-4.0.18.1.tar.bz2