diff --git a/.cvsignore b/.cvsignore
index d3c0479..9a98b72 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yum-3.1.6.tar.gz
+yum-3.1.7.tar.gz
diff --git a/sources b/sources
index e7e4f4e..3655f50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-085d80882da89420f047066fce909ecf  yum-3.1.6.tar.gz
+c317ade22db79a82ba0bbe3676b68fa9  yum-3.1.7.tar.gz
diff --git a/yum.spec b/yum.spec
index 0634767..17c0d9b 100644
--- a/yum.spec
+++ b/yum.spec
@@ -2,8 +2,8 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.1.6
-Release: 3%{?dist}
+Version: 3.1.7
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.1/%{name}-%{version}.tar.gz
@@ -14,8 +14,6 @@ Source99: plugin.conf
 # default plugins here
 Source100: installonlyn.py
 
-Patch0: yum-misc-fixes.patch
-
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -24,7 +22,7 @@ Conflicts: pirut < 1.1.4
 Requires: python >= 2.4, rpm-python, rpm >= 0:4.4.2
 Requires: python-sqlite
 Requires: urlgrabber
-Requires: yum-metadata-parser
+Requires: yum-metadata-parser >= 1.1.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,7 +47,6 @@ can notify you when they are available via email, syslog or dbus.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 make
@@ -121,6 +118,10 @@ exit 0
 
 
 %changelog
+* Fri Apr 27 2007 Jeremy Katz <katzj@redhat.com> - 3.1.7-1
+- update to 3.1.7 with lots of fixes (including #233427, #237425, #236152, 
+  #223607, #230851, #232202, #221940, #236409, #201393, #237599)
+
 * Mon Apr 23 2007 Jeremy Katz <katzj@redhat.com> - 3.1.6-3
 - include the fix for comps files in extra repos with anaconda (#237546)