diff --git a/.cvsignore b/.cvsignore
index 6679372..4fd07ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lsof_4.81-rh.tar.bz2
+lsof_4.82-rh.tar.bz2
diff --git a/lsof.spec b/lsof.spec
index 96c6703..0d31147 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.81
-Release: 4%{?dist}
+Version: 4.82
+Release: 1%{?dist}
 License: zlib
 Group: Development/Debuggers
 
@@ -11,7 +11,7 @@ Group: Development/Debuggers
 # The script you can found in CVS or download from:
 # http://cvs.fedoraproject.org/viewcvs/rpms/lsof/devel/upstream2downstream.sh
 #
-%define lsofrh lsof_4.81-rh
+%define lsofrh lsof_%{version}-rh
 Source0: %{lsofrh}.tar.bz2
 URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
 
@@ -21,8 +21,8 @@ BuildRequires: libselinux-devel
 
 # 184338 - allow lsof access nptl threads
 Patch1: lsof_4.81-threads.patch
-# 480694 - lsof manpage mismarked and formats badly
-Patch2: lsof_4.81-man.patch
+# Backport of upstream patch
+Patch2: lsof_4.83A-selinux-typo.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -56,6 +56,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jul 27 2009 Karel Zak <kzak@redhat.com> 4.82-1
+- upgrade to 4.82 (see the 00DIST file for list of changes)
+- backport an upstream patch from 4.83A-linux
+- remove lsof_4.81-man.patch (fixed upstream)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.81-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/lsof_4.81-man.patch b/lsof_4.81-man.patch
deleted file mode 100644
index a20db67..0000000
--- a/lsof_4.81-man.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up lsof_4.81-rh/lsof.8.kzak lsof_4.81-rh/lsof.8
---- lsof_4.81-rh/lsof.8.kzak	2009-01-30 12:19:34.000000000 +0100
-+++ lsof_4.81-rh/lsof.8	2009-01-30 12:54:00.000000000 +0100
-@@ -127,27 +127,27 @@ listing of all network files OR files be
- by user ``foo''.
- The exceptions are:
- .IP
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 1)
- the `^' (negated) login name or user ID (UID), specified with the
- .B \-u
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 2)
- the `^' (negated) process ID (PID), specified with the
- .B \-p
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 3)
- the `^' (negated) process group ID (PGID), specified with the
- .B \-g
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 4)
- the `^' (negated) command, specified with the
- .B \-c
- option;
--.TP \w'1) 'u
-+.TP \w'1)'u+1
- 5)
- the ('^') negated TCP or UDP protocol state names, specified with the
- .BI \-s " [p:s]"
diff --git a/lsof_4.83A-selinux-typo.patch b/lsof_4.83A-selinux-typo.patch
new file mode 100644
index 0000000..50e08a6
--- /dev/null
+++ b/lsof_4.83A-selinux-typo.patch
@@ -0,0 +1,16 @@
+
+ Upstream patch, backported from 4.83A-linux.
+                          -- kzak 27-Jul-2009
+
+diff -up lsof_4.82-rh/Configure.kzak lsof_4.82-rh/Configure
+--- lsof_4.82-rh/Configure.kzak	2009-07-27 09:50:15.000000000 +0200
++++ lsof_4.82-rh/Configure	2009-07-27 09:50:43.000000000 +0200
+@@ -2700,7 +2700,7 @@ return(0); }
+ 	LSOF_TMP1=1
+       fi	# }
+     else
+-      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "xY" # {
++      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # {
+       then
+ 	LSOF_TMP1=1
+       fi	# }
diff --git a/sources b/sources
index 19bab65..0f4b6ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5ef18418760dd304b223a4acb3e14d7  lsof_4.81-rh.tar.bz2
+1361fa10f97f4c151aaec52815cd9d60  lsof_4.82-rh.tar.bz2