diff --git a/manifests/os/debian.pp b/manifests/os/debian.pp
index 90c9355dd9bc4f4e678108cd27a97a68484497b4..c782efee7a029bcf7d0281736e4cf9c6cee5b444 100644
--- a/manifests/os/debian.pp
+++ b/manifests/os/debian.pp
@@ -115,9 +115,11 @@ class base::os::debian {
 
   # Handle additional distribution-specific tweaks, usually related to the
   # default package set.
-  # FIXME - Move emacs23-nox to defaults class at some point
-  package { 'emacs23-nox': ensure => present }
-
+  case $::lsbdistcodename {
+    'wheezy': { package { 'emacs23-nox': ensure => present } }
+    'jessie': { package { 'emacs24-nox': ensure => present } }
+  }
+  
   # Ensure this file exists, containing only a comment.
   file { '/etc/default/locale':
     ensure  => present,