diff --git a/manifests/os/debian.pp b/manifests/os/debian.pp
index 1d8fa83661012eeaea654e7df3e1ed4578d58224..12e802d2d8e2bf209a2efffa284b3561410aa100 100644
--- a/manifests/os/debian.pp
+++ b/manifests/os/debian.pp
@@ -126,8 +126,9 @@ class base::os::debian (
   # Handle additional distribution-specific tweaks, usually related to the
   # default package set.
   case $::lsbdistcodename {
-    'wheezy': { package { 'emacs23-nox': ensure => present } }
-    'jessie': { package { 'emacs24-nox': ensure => present } }
+    'wheezy':  { package { 'emacs23-nox': ensure => present } }
+    'jessie':  { package { 'emacs24-nox': ensure => present } }
+    'stretch': { package { 'emacs-nox':   ensure => present } }
   }
 
   # Ensure this file exists, containing only a comment.