diff --git a/.cvsignore b/.cvsignore
index 1c5be9b..3514223 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 yum-2.1.8.tar.gz
 yum-2.1.9.tar.gz
 yum-2.1.10.tar.gz
+yum-2.1.12.tar.gz
diff --git a/sources b/sources
index a37c9ea..0f8ab2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f038729a7b5720af6af97a91b845537  yum-2.1.11.tar.gz
+89aa928d611dcd3459e83df3597a05e3  yum-2.1.12.tar.gz
diff --git a/yum.spec b/yum.spec
index d60b938..7edd577 100644
--- a/yum.spec
+++ b/yum.spec
@@ -2,14 +2,14 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 2.1.11
-Release: 4
+Version: 2.1.12
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.1/yum-%{version}.tar.gz
 #Source0: http://linux.duke.edu/yum/download/2.1/daily/yum-%{cvsdate}.tar.gz
 Source1: yum.conf.fedora
-Patch0: yum-ia32e-2.1.11.patch
+Patch0: urlgrabber-python2.4.patch
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -72,6 +72,10 @@ exit 0
 %{_mandir}/man*/*
 
 %changelog
+* Mon Nov 29 2004 Jeremy Katz <katzj@redhat.com> - 2.1.12-1
+- update to 2.1.12
+- add hack from jbj to workaround python 2.4 urllib breakage (#138535)
+
 * Mon Nov  8 2004 Jeremy Katz <katzj@redhat.com> - 2.1.11-4
 - rebuild for python 2.4