diff --git a/NEWS b/NEWS
index c47d3658996b5d11e56b51c1704888aa5aecf10e..0bcc7eb66a6cf25c0bed3fb6d31513869d0a0ae4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+UNRELEASED
+
+    [rpm] Remove EL6 package requires of yum-plugin-downloadonly, since
+    yum-3.2.29-69 includes this plugin and obsoletes the individual
+    package (thus putting the puppet ensure in a loop) (jlent)
+
 release/004.051 (2015-07-24)
 
     [os] Small fix in base::os::debian to one of the systemd-related 
diff --git a/manifests/rpm.pp b/manifests/rpm.pp
index 74deffe0cbceccfd53ac38c963e6b9316dabb0f1..4f565e7c0670ce6a071823c12c00dbe8057bfaa5 100644
--- a/manifests/rpm.pp
+++ b/manifests/rpm.pp
@@ -68,15 +68,12 @@ class base::rpm {
         }
         # RHEL5+
         default: {
-          # EL7 includes this plugin by default
-          if ($::lsbmajdistrelease != '7') {
-            $yumpackage = $::lsbmajdistrelease ? {
-              '5' => 'yum-downloadonly',
-              '6' => 'yum-plugin-downloadonly',
+          # EL6/7 includes this plugin by default 
+          if ($::lsbmajdistrelease == '5') {
+            package { 'yum-downloadonly': 
+              ensure => installed,
             }
-            package { $yumpackage: ensure => present; }
           }
-
           # RHEL systems need this plugin enabled, due to new licensing
           if ($::operatingsystem == 'RedHat') {
             # enable yum rhn plugin