diff --git a/Cfg/etc/xen/pgsql/pgsql b/Cfg/etc/xen/pgsql/pgsql
index dec9e02..4cec50a 100644
--- a/Cfg/etc/xen/pgsql/pgsql
+++ b/Cfg/etc/xen/pgsql/pgsql
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python -*-
 
-execfile("/etc/xen/common.py")
+execfile("/etc/xen/common_squeeze.py")
 
 name = "pgsql"
 
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 9f2091f..1c1fe68 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -319,7 +319,7 @@
 
   <Group name="pgsql"
      profile="true">
-    <Group name="crans-lenny"/>
+    <Group name="crans-squeeze"/>
     <Group name="domu"/>
     <Group name="adm-only"/>
     <Group name="pgsql-server"/>
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index d302d90..873004f 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -128,8 +128,8 @@ service("openvpn-freebox",
 
 service("pgsql-server",
         name="postgresql",
-        init="postgresql-8.3",
-        pidp="/var/lib/postgresql/8.3/main/postmaster.pid",
+        init="postgresql",
+        pidp="/var/lib/postgresql/8.4/main/postmaster.pid",
         extra=["if failed port 5432 timeout 30 seconds then restart"])
 
 service("postfix",