diff --git a/cfengine/inputs/cf.classes b/cfengine/inputs/cf.classes
index 97ab1e2..e91595e 100644
--- a/cfengine/inputs/cf.classes
+++ b/cfengine/inputs/cf.classes
@@ -114,6 +114,8 @@ groups:
     package_vconfig = ( service_xen_node )
     package_mc      = ( service_powerdev )
     package_emacs   = ( service_powerdev ash inkscape )
+    package_modpython   = ( package_trac )
+    package_trac    = ( bouncervm deluge jaws olpc osi twist )
 
     # This has to come after the packages section to pull in the correct hosts
     service_mysql_client = ( package_mysql41 package_mysql5 -service_mysql )
diff --git a/cfengine/inputs/cf.packages b/cfengine/inputs/cf.packages
index 36b6d53..aa51ddb 100644
--- a/cfengine/inputs/cf.packages
+++ b/cfengine/inputs/cf.packages
@@ -125,6 +125,13 @@ packages:
         app-editors/emacs cmp=ge version=22.1-r3 action=install
         app-editors/emacs cmp=lt version=22 define=remove_old_emacs 
 
+    package_trac::
+        www-apps/trac cmp=ge version=0.10.3.1 action=install
+        dev-python/setuptools action=install
+
+    package_modpython::
+        www-apache/mod_python action=install
+
     # chname uses utsname namespaces to change the hostname for a single process
     host_chroot::
         sys-apps/chname action=install
@@ -350,7 +357,13 @@ copy:
             dest=/etc/portage/package.use/mc
             mode=644
             server=$(gold)
-    
+
+    package_trac::
+        $(masterfiles)/etc/portage/package.use/trac
+            dest=/etc/portage/package.use/trac
+            mode=644
+            server=$(gold)
+
     service_powerdev::
         $(masterfiles)/etc/portage/package.keywords/powerdev
             dest=/etc/portage/package.keywords/powerdev
diff --git a/cfengine/inputs/hosts/cf.bouncervm b/cfengine/inputs/hosts/cf.bouncervm
index e949eb2..6d1defc 100644
--- a/cfengine/inputs/hosts/cf.bouncervm
+++ b/cfengine/inputs/hosts/cf.bouncervm
@@ -33,19 +33,6 @@ copy:
             server=$(gold)
             purge=true
 
-        $(masterfiles)/etc/portage/package.use/bouncervm
-            dest=/etc/portage/package.use/bouncervm
-            mode=644
-            server=$(gold)
-
-packages:
-
-    bouncervm_osuosl_org::
-        # trac install
-        www-apps/trac cmp=ge version=0.10.3.1 action=install
-        www-apache/mod_python action=install
-        dev-python/setuptools action=install
-
 links:
 
     bouncervm_osuosl_org::
diff --git a/cfengine/inputs/hosts/cf.deluge b/cfengine/inputs/hosts/cf.deluge
index 03ae9de..99789ba 100644
--- a/cfengine/inputs/hosts/cf.deluge
+++ b/cfengine/inputs/hosts/cf.deluge
@@ -22,18 +22,7 @@ copy:
             mode=644
             server=$(gold)
 
-        $(masterfiles)/etc/portage/package.use/deluge
-            dest=/etc/portage/package.use/deluge
-            mode=644
-            server=$(gold)
-
 links:
 
     deluge_osuosl_org::
         /etc/runlevels/default/net.eth0 -> /etc/init.d/net.eth0
-
-packages:
-
-    deluge_osuosl_org::
-        www-apps/trac action=install
-        www-apache/mod_python action=install
diff --git a/cfengine/inputs/hosts/cf.jaws b/cfengine/inputs/hosts/cf.jaws
index 43634bb..11fa088 100644
--- a/cfengine/inputs/hosts/cf.jaws
+++ b/cfengine/inputs/hosts/cf.jaws
@@ -24,11 +24,6 @@ copy:
             mode=644
             server=$(gold)
 
-        $(masterfiles)/etc/portage/package.use/jaws
-            dest=/etc/portage/package.use/jaws
-            mode=644
-            server=$(gold)
-
         $(masterfiles)/etc/apache2/ssl/osl
             dest=/etc/apache2/ssl
             r=1
@@ -43,15 +38,6 @@ copy:
             mode=644
             server=$(gold)
 
-
-packages:
-
-    jaws_osuosl_org::
-        # trac install
-        www-apps/trac cmp=ge version=0.10.3.1 action=install
-        www-apache/mod_python action=install
-        dev-python/setuptools action=install
-
 links:
 
     jaws_osuosl_org::
diff --git a/cfengine/inputs/hosts/cf.olpc b/cfengine/inputs/hosts/cf.olpc
index 2e009c4..fdfbf74 100644
--- a/cfengine/inputs/hosts/cf.olpc
+++ b/cfengine/inputs/hosts/cf.olpc
@@ -11,11 +11,6 @@ copy:
             mode=644
             server=$(gold)
 
-        $(masterfiles)/etc/portage/package.use/olpc
-            dest=/etc/portage/package.use/olpc
-            mode=644
-            server=$(gold)
-
         $(masterfiles)/etc/apache2/ssl/osl
             dest=/etc/apache2/ssl
             r=1
@@ -40,9 +35,6 @@ copy:
 packages:
 
     olpc_osuosl_org::
-        www-apps/trac cmp=ge version=0.10.3.1 action=install
-        www-apache/mod_python action=install
-        dev-python/setuptools action=install
         dev-php/PEAR-PEAR cmp=ge version=1.6.2-r1 action=install  
 links:
 
diff --git a/cfengine/inputs/hosts/cf.osi b/cfengine/inputs/hosts/cf.osi
index 76d8385..bade705 100644
--- a/cfengine/inputs/hosts/cf.osi
+++ b/cfengine/inputs/hosts/cf.osi
@@ -11,11 +11,6 @@ copy:
             mode=644
             server=$(gold)
 
-        $(masterfiles)/etc/portage/package.use/osi
-            dest=/etc/portage/package.use/osi
-            mode=644
-            server=$(gold)
-
         $(masterfiles)/etc/apache2/vhosts.d/osi
             dest=/etc/apache2/vhosts.d
             r=1
@@ -38,14 +33,6 @@ copy:
             server=$(gold)
             purge=true
 
-packages:
-
-    osi_osuosl_org::
-        # trac install
-        www-apps/trac cmp=ge version=0.10.3.1 action=install
-        www-apache/mod_python action=install
-        dev-python/setuptools action=install
-
 links:
 
     osi_osuosl_org::
diff --git a/cfengine/inputs/hosts/cf.twist b/cfengine/inputs/hosts/cf.twist
index f0f489f..86030b0 100644
--- a/cfengine/inputs/hosts/cf.twist
+++ b/cfengine/inputs/hosts/cf.twist
@@ -44,8 +44,3 @@ packages:
 
     twist_osuosl_org::
         =www-apps/lxr-0.9.5 action=install
-        # trac install for osel
-        www-apps/trac cmp=ge version=0.10.3.1 action=install
-        www-apache/mod_python action=install
-        dev-python/setuptools action=install
-
diff --git a/files/etc/portage/package.use/bouncervm b/files/etc/portage/package.use/bouncervm
deleted file mode 100644
index 344be65..0000000
--- a/files/etc/portage/package.use/bouncervm
+++ /dev/null
@@ -1 +0,0 @@
-www-apps/trac sqlite enscript
diff --git a/files/etc/portage/package.use/deluge b/files/etc/portage/package.use/deluge
deleted file mode 100644
index bdbd9b4..0000000
--- a/files/etc/portage/package.use/deluge
+++ /dev/null
@@ -1 +0,0 @@
-www-apps/trac sqlite
diff --git a/files/etc/portage/package.use/jaws b/files/etc/portage/package.use/jaws
deleted file mode 100644
index 344be65..0000000
--- a/files/etc/portage/package.use/jaws
+++ /dev/null
@@ -1 +0,0 @@
-www-apps/trac sqlite enscript
diff --git a/files/etc/portage/package.use/olpc b/files/etc/portage/package.use/olpc
deleted file mode 100644
index 344be65..0000000
--- a/files/etc/portage/package.use/olpc
+++ /dev/null
@@ -1 +0,0 @@
-www-apps/trac sqlite enscript
diff --git a/files/etc/portage/package.use/osi b/files/etc/portage/package.use/osi
deleted file mode 100644
index 344be65..0000000
--- a/files/etc/portage/package.use/osi
+++ /dev/null
@@ -1 +0,0 @@
-www-apps/trac sqlite enscript
diff --git a/files/etc/portage/package.use/trac b/files/etc/portage/package.use/trac
new file mode 100644
index 0000000..344be65
--- /dev/null
+++ b/files/etc/portage/package.use/trac
@@ -0,0 +1 @@
+www-apps/trac sqlite enscript
diff --git a/files/etc/portage/package.use/twist b/files/etc/portage/package.use/twist
index 0a620b8..7489fda 100644
--- a/files/etc/portage/package.use/twist
+++ b/files/etc/portage/package.use/twist
@@ -1,2 +1 @@
 www-apps/lxr vhost freetext mysql
-www-apps/trac sqlite enscript