diff --git a/c6-i386-comps.xml b/c6-i386-comps.xml
index 585041b..aaa31ec 100644
--- a/c6-i386-comps.xml
+++ b/c6-i386-comps.xml
@@ -1034,7 +1034,6 @@
       <packagereq type="optional">x86info</packagereq>
       <packagereq type="optional">yum-plugin-aliases</packagereq>
       <packagereq type="optional">yum-plugin-changelog</packagereq>
-      <packagereq type="optional">yum-plugin-downloadonly</packagereq>
       <packagereq type="optional">yum-plugin-ovl</packagereq>
       <packagereq type="optional">yum-plugin-protect-packages</packagereq>
       <packagereq type="optional">yum-plugin-tmprepo</packagereq>
@@ -11435,7 +11434,7 @@
       <packagereq type="optional">gsl-devel</packagereq>
       <packagereq type="optional">gsl-static</packagereq>
       <packagereq type="optional">lapack</packagereq>
-      <packagereq type="optional">mpich2</packagereq>
+      <packagereq type="optional">mpich</packagereq>
       <packagereq type="optional">mpitests-mvapich</packagereq>
       <packagereq type="optional">mpitests-mvapich2</packagereq>
       <packagereq type="optional">mpitests-openmpi</packagereq>
diff --git a/c6-x86_64-comps.xml b/c6-x86_64-comps.xml
index aa9c2c7..1a6fede 100644
--- a/c6-x86_64-comps.xml
+++ b/c6-x86_64-comps.xml
@@ -1034,7 +1034,6 @@
       <packagereq type="optional">x86info</packagereq>
       <packagereq type="optional">yum-plugin-aliases</packagereq>
       <packagereq type="optional">yum-plugin-changelog</packagereq>
-      <packagereq type="optional">yum-plugin-downloadonly</packagereq>
       <packagereq type="optional">yum-plugin-ovl</packagereq>
       <packagereq type="optional">yum-plugin-protect-packages</packagereq>
       <packagereq type="optional">yum-plugin-tmprepo</packagereq>
@@ -11644,7 +11643,7 @@
       <packagereq type="optional">gsl-devel</packagereq>
       <packagereq type="optional">gsl-static</packagereq>
       <packagereq type="optional">lapack</packagereq>
-      <packagereq type="optional">mpich2</packagereq>
+      <packagereq type="optional">mpich</packagereq>
       <packagereq type="optional">mpitests-mvapich</packagereq>
       <packagereq type="optional">mpitests-mvapich2</packagereq>
       <packagereq type="optional">mpitests-openmpi</packagereq>