diff --git a/.cvsignore b/.cvsignore
index c0b27a1..accc18d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ floppy-0.12.tar.gz
 kbdrate.tar.gz
 util-linux-2.12a.tar.gz
 util-linux-2.12j.tar.gz
+util-linux-2.12p.tar.gz
diff --git a/sources b/sources
index d135cc9..d9ab3fb 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
-870bdcd9515b92dad1fdc69be63d6858  util-linux-2.12j.tar.gz
+d47e820f6880c21c8b4c0c7e8a7376cc  util-linux-2.12p.tar.gz
diff --git a/util-linux-2.12p-swaponsymlink-57300.patch b/util-linux-2.12p-swaponsymlink-57300.patch
new file mode 100644
index 0000000..f527218
--- /dev/null
+++ b/util-linux-2.12p-swaponsymlink-57300.patch
@@ -0,0 +1,24 @@
+--- util-linux-2.12p/mount/swapon.c.sopwith	Wed Dec 22 04:50:19 2004
++++ util-linux-2.12p/mount/swapon.c	Thu Dec 23 14:44:49 2004
+@@ -138,9 +138,19 @@
+ is_in_proc_swaps(const char *fname) {
+ 	int i;
+ 
+-	for (i = 0; i < numSwaps; i++)
+-		if (swapFiles[i] && !strcmp(fname, swapFiles[i]))
++	for (i = 0; i < numSwaps; i++) {
++	        struct stat swapped, swapping;
++
++		if (!swapFiles[i]) continue;
++
++		if (!strcmp(fname, swapFiles[i])
++ 		    || (!stat (swapFiles[i], &swapped)
++ 			&& !stat (fname, &swapping)
++ 			&& (swapped.st_dev == swapping.st_dev
++ 			    && swapped.st_ino == swapping.st_ino)))
++		    )
+ 			return 1;
++	}
+ 	return 0;
+ }
+ 
diff --git a/util-linux.spec b/util-linux.spec
index 743cde2..e03e6f0 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -26,7 +26,7 @@
 
 Summary: A collection of basic system utilities.
 Name: util-linux
-Version: 2.12j
+Version: 2.12p
 Release: 1
 License: distributable
 Group: System Environment/Base
@@ -65,52 +65,39 @@ Patch109: util-linux-2.11f-rawman.patch
 ######## Patches that should be upstream eventually
 Patch100: util-linux-2.12j-managed.patch
 
-Patch106: util-linux-2.11w-swaponsymlink-57300.patch
+Patch106: util-linux-2.12p-swaponsymlink-57300.patch
 Patch107: util-linux-2.11y-procpartitions-37436.patch
 Patch113: util-linux-2.11r-ctty3.patch
 
 Patch120: util-linux-2.11y-skipraid2.patch
-Patch125: util-linux-2.11y-umask-82552.patch
 Patch126: util-linux-2.11y-multibyte.patch
 Patch128: util-linux-2.12a-ipcs-84243-86285.patch
 
-Patch131: util-linux-2.11y-sysmap-85407.patch
 Patch138: util-linux-2.11y-chsh-103004.patch
 Patch139: util-linux-2.11y-fdisksegv-103954.patch
-Patch142: util-linux-2.12j-mountman-90588.patch
 
 Patch143: cramfs-1.1-blocksize_and_quiet.patch
 Patch144: cramfs-1.1-pagesize.patch
 
 Patch147: util-linux-2.12a-126572-fdiskman.patch
-Patch149: util-linux-2.12j-125531-swaplabel.patch
 Patch150: floppy-0.12-locale.patch
 
 Patch151: util-linux-2.12a-mountbylabel-dm.patch
-Patch152: util-linux-2.12j-mountnolabel.patch
 Patch153: util-linux-2.12a-16415-rdevman.patch
-Patch154: util-linux-2.11y-102566-loginman.patch
-Patch155: util-linux-2.12a-104321-rescuept.patch
-Patch156: util-linux-2.12j-fdiskmessage-107824.patch
 
 # Patch to enabled remote service for login/pam (#91174)
 Patch157: util-linux-2.12a-pamstart.patch
 
-Patch158: util-linux-2.12a-moreswaplabel.patch
-
 # Patch to enable the pamconsole flag for restricting mounting to users at the console (#133941)
 Patch159: util-linux-2.12j-pamconsole.patch
 
 # Allow raw(8) to bind raw devices whose device nodes do not yet exist.
 Patch160: raw-handle-nonpresent-devs.patch
 
-Patch163: util-linux-2.12j-140437-sgisectors.patch
 Patch164: util-linux-2.12j-113790-hotkeys.patch
-Patch165: util-linux-2.12a-117855-mountman.patch
-Patch166: util-linux-2.12a-134860-sldocs.patch
 
 # patches required for NFSv4 support
-Patch1000: util-linux-2.12j-nfsv4.patch
+Patch1000: util-linux-2.12p-nfsv4.patch
 Patch1001: util-linux-2.12a-mount-proto.patch
 Patch1002: util-linux-2.12a-nfsmount-overflow.patch
 
@@ -195,42 +182,29 @@ mv MCONFIG.new MCONFIG
 %patch113 -p1
 %patch120 -p1
 
-%patch125 -p1
 %patch126 -p1
 %patch128 -p1
 
-%patch131 -p1
 %patch138 -p1
 %patch139 -p1
-%patch142 -p1
 
 # cramfs
 %patch143 -p0
 %patch144 -p1
 
 %patch147 -p1
-%patch149 -p1
 %patch150 -p0
 
 %patch151 -p1
-%patch152 -p1
 %patch153 -p1
-%patch154 -p1
-%patch155 -p1
-%patch156 -p1 -b .fdiskmessage
 %patch157 -p1 -b .pamstart
-%patch158 -p1
-
 %patch159 -p1 -b .console
 
 %if %{include_raw}
 %patch160 -p1
 %endif
 
-%patch163 -p1
 %patch164 -p1
-%patch165 -p1
-%patch166 -p1
 
 %patch1000 -p1 -b .nfsv4
 %patch1001 -p1
@@ -612,6 +586,11 @@ fi
 /sbin/losetup
 
 %changelog
+* Thu Dec 23 2004 Elliot Lee <sopwith@redhat.com> 2.12p-1
+- Update to util-linux-2.12p. This changes swap header format
+  from - you may need to rerun mkswap if you did a clean install of
+  FC3.
+
 * Fri Dec 10 2004 Elliot Lee <sopwith@redhat.com> 2.12j-1
 - Update to util-linux-2.12j