diff --git a/.cvsignore b/.cvsignore
index 4b3806e..37568c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-22.2.tar.gz
+psmisc-22.3.tar.gz
diff --git a/psmisc-22.3-fuser-ipv6.patch b/psmisc-22.3-fuser-ipv6.patch
new file mode 100644
index 0000000..d901943
--- /dev/null
+++ b/psmisc-22.3-fuser-ipv6.patch
@@ -0,0 +1,11 @@
+--- psmisc-22.3/src/fuser.c.kzak	2007-03-01 13:20:17.000000000 +0100
++++ psmisc-22.3/src/fuser.c	2007-03-01 13:01:38.000000000 +0100
+@@ -249,7 +249,7 @@
+ 	ip_tmp->name = this_name;
+ 	ip_tmp->lcl_port = lcl_port;
+ 	ip_tmp->rmt_port = rmt_port;
+-	memcpy(&(ip_tmp->rmt_port),&(rmt_port),sizeof(struct in6_addr));
++	memcpy(&(ip_tmp->rmt_address),&(rmt_address),sizeof(struct in6_addr));
+ 	ip_tmp->next = ip_head;
+ 
+ 	*ip_list = ip_tmp;
diff --git a/psmisc.spec b/psmisc.spec
index b3ce8e9..4f13e8b 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -1,7 +1,7 @@
-Summary: Utilities for managing processes on your system.
+Summary: Utilities for managing processes on your system
 Name: psmisc
-Version: 22.2
-Release: 5
+Version: 22.3
+Release: 1%{?dist}
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -9,10 +9,11 @@ URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: libselinux-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext
 BuildRequires: ncurses-devel
 
-Patch0: psmisc-22.1-fuser-listsigs.patch
+# backport from upstream CVS
+Patch0: psmisc-22.3-fuser-ipv6.patch
 
 %description
 The psmisc package contains utilities for managing processes on your
@@ -29,7 +30,7 @@ of processes that are using specified files or filesystems.
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure --prefix=/usr --enable-selinux
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Thu Mar  1 2007 Karel Zak <kzak@redhat.com> 22.3-1
+- update to upstream 22.3
+- backport ipv6 bugfix from upstream CVS
+- clean up spec file
+
 * Wed Jul 19 2006 Karel Zak <kzak@redhat.com>  - 22.2-5
 - spec file cleanup & rebuild
 
@@ -194,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 - automated rebuild
 
 * Thu May 16 2002 Bernhard Rosenkraenzer <bero@redhat.com> 20.2-4
-- Autogenerate the signal list from %{_includedir}/bits/signum.h
+- Autogenerate the signal list from _includedir/bits/signum.h
   to make sure it works on all arches and doesn't break again.
 
 * Wed May  8 2002 Trond Eivind Glomsrod <teg@redhat.com> 20.2-3
diff --git a/sources b/sources
index 5c523f8..00a237b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77737c817a40ef2c160a7194b5b64337  psmisc-22.2.tar.gz
+0c44b995d068a221daf35d23e13db419  psmisc-22.3.tar.gz