diff --git a/servers/puppet/manifests/site.pp b/servers/puppet/manifests/site.pp
index 3bfaa3bf40..bd648f7d5a 100644
--- a/servers/puppet/manifests/site.pp
+++ b/servers/puppet/manifests/site.pp
@@ -30,9 +30,8 @@ define common::append ($file, $line) {
 
 class humbug_base {
   $packages = [ "screen", "strace", "vim", "emacs", "git", "python-tz", "sqlite3", "ntp",
-                "python-tornado",  "python-simplejson", "python-pygments", "ipython", "host",
-                "python-django", "openssh-server", "python-pip", "puppet-el", "python-flup",
-                "iptables-persistent", "nagios-plugins-basic", ]
+                "python-simplejson", "ipython", "host", "openssh-server", "python-pip",
+                "puppet-el", "iptables-persistent", "nagios-plugins-basic", ]
   package { $packages: ensure => "installed" }
 
   # FIXME: Stop using pip since it is insecure
@@ -201,7 +200,8 @@ class humbug_apache_base {
 }
 
 class humbug_app_frontend {
-  $web_packages = [ "nginx", "memcached", "python-pylibmc", ]
+  $web_packages = [ "nginx", "memcached", "python-pylibmc", "python-tornado", "python-django",
+                    "python-pygments", "python-flup", ]
   package { $web_packages: ensure => "installed" }
   file { "/etc/nginx/nginx.conf":
     require => Package[nginx],