diff --git a/manifests/version.pp b/manifests/version.pp
index 010061b70..f22797c4c 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -12,14 +12,14 @@
 
   case $::osfamily {
     'RedHat': {
-      if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
+      if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($distrelease, '7') >= 0) {
         $default = '2.4'
       } else {
         $default = '2.2'
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
+      if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 {
         $default = '2.4'
       } elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
         $default = '2.4'