diff --git a/quattor/server/rpms.pan b/quattor/server/rpms.pan
index 0051544bd..69a7a6b6b 100644
--- a/quattor/server/rpms.pan
+++ b/quattor/server/rpms.pan
@@ -1,16 +1,17 @@
 unique template quattor/server/rpms;
 
-prefix '/software/packages';
-
 # Apache
 include 'rpms/web_server';
 
-# DHCP
-'{dhcp}' = nlist();
-
-# DHCP
-'{tftp-server}' = nlist();
+'/software/packages' = {
+    if ( OS_VERSION_PARAMS['majorversion'] >= '8' ) {
+        pkg_repl('dhcp-client');
+    } else {
+        pkg_repl('dhcp');
+    };
 
-# Add Subversion
-'{subversion}' = nlist();
+    pkg_repl('tftp-server');
+    pkg_repl('subversion');
 
+    SELF;
+};