diff -Naur calendarserver-2.4.dfsg.orig/bin/caldavd calendarserver-2.4.dfsg/bin/caldavd
--- calendarserver-2.4.dfsg.orig/bin/caldavd	2008-10-29 05:06:36.000000000 +0530
+++ calendarserver-2.4.dfsg/bin/caldavd	2010-08-24 21:59:30.000000000 +0530
@@ -23,7 +23,7 @@
 username="";
 groupname="";
 configfile="";
-twistdpath="$(type -p twistd)";
+twistdpath="/usr/lib/twisted-calendarserver/bin/twistd";
 plugin_name="caldav";
 service_type="";
 profile="";
@@ -116,7 +116,7 @@
 
 if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi;
 
-export PYTHONPATH
+export PYTHONPATH=`${python} -c 'import sys; print "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3])'`
 
 echo exec "${python}" "${twistdpath}" "${twistd_reactor}" ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${profile} "${child_reactor}";
 
diff -Naur calendarserver-2.4.dfsg.orig/bin/calendarserver_export calendarserver-2.4.dfsg/bin/calendarserver_export
--- calendarserver-2.4.dfsg.orig/bin/calendarserver_export	2009-05-08 02:42:08.000000000 +0530
+++ calendarserver-2.4.dfsg/bin/calendarserver_export	2010-08-24 21:59:30.000000000 +0530
@@ -17,7 +17,7 @@
 
 import sys
 
-#PYTHONPATH
+PYTHONPATH = "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3])
 
 if __name__ == "__main__":
     if "PYTHONPATH" in globals():
diff -Naur calendarserver-2.4.dfsg.orig/bin/calendarserver_manage_principals calendarserver-2.4.dfsg/bin/calendarserver_manage_principals
--- calendarserver-2.4.dfsg.orig/bin/calendarserver_manage_principals	2009-05-08 02:59:14.000000000 +0530
+++ calendarserver-2.4.dfsg/bin/calendarserver_manage_principals	2010-08-24 21:59:30.000000000 +0530
@@ -19,7 +19,7 @@
 from __future__ import with_statement
 import sys
 
-#PYTHONPATH
+PYTHONPATH = "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3])
 
 if __name__ == "__main__":
     if "PYTHONPATH" in globals():
diff -Naur calendarserver-2.4.dfsg.orig/bin/calendarserver_warmup calendarserver-2.4.dfsg/bin/calendarserver_warmup
--- calendarserver-2.4.dfsg.orig/bin/calendarserver_warmup	2009-05-09 04:04:49.000000000 +0530
+++ calendarserver-2.4.dfsg/bin/calendarserver_warmup	2010-08-24 21:59:30.000000000 +0530
@@ -17,7 +17,7 @@
 
 import sys
 
-#PYTHONPATH
+PYTHONPATH = "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3])
 
 if __name__ == "__main__":
     if "PYTHONPATH" in globals():
diff -Naur calendarserver-2.4.dfsg.orig/conf/caldavd.plist calendarserver-2.4.dfsg/conf/caldavd.plist
--- calendarserver-2.4.dfsg.orig/conf/caldavd.plist	2010-08-24 21:58:56.000000000 +0530
+++ calendarserver-2.4.dfsg/conf/caldavd.plist	2010-08-24 21:59:30.000000000 +0530
@@ -36,13 +36,13 @@
 
     <!-- HTTP port [0 = disable HTTP] -->
     <key>HTTPPort</key>
-    <integer>80</integer>
+    <integer>8008</integer>
 
     <!-- SSL port [0 = disable HTTPS] -->
     <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
     <!--
     <key>SSLPort</key>
-    <integer>443</integer>
+    <integer>8443</integer>
     -->
 
     <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
@@ -78,11 +78,11 @@
 
     <!-- Data root -->
     <key>DataRoot</key>
-    <string>/Library/CalendarServer/Data/</string>
+    <string>/var/lib/caldavd/</string>
 
     <!-- Document root -->
     <key>DocumentRoot</key>
-    <string>/Library/CalendarServer/Documents/</string>
+    <string>/var/spool/caldavd/</string>
 
     <!-- Child aliases -->
     <key>Aliases</key>
@@ -391,7 +391,7 @@
 
     <!-- Global server stats --> 
     <key>GlobalStatsSocket</key> 
-    <string>/var/run/caldavd-stats.sock</string> 
+    <string>/var/run/caldavd/caldavd-stats.sock</string> 
 
     <!-- Server statistics file -->
     <key>ServerStatsFile</key>
@@ -399,7 +399,7 @@
 
     <!-- Server process ID file -->
     <key>PIDFile</key>
-    <string>/var/run/caldavd.pid</string>
+    <string>/var/run/caldavd/caldavd.pid</string>
 
 
     <!--
@@ -420,10 +420,10 @@
       -->
 
     <key>UserName</key>
-    <string>daemon</string>
+    <string>caldavd</string>
 
     <key>GroupName</key>
-    <string>daemon</string>
+    <string>caldavd</string>
 
     <key>ProcessType</key>
     <string>Combined</string>
@@ -431,7 +431,7 @@
     <key>MultiProcess</key>
     <dict>
       <key>ProcessCount</key>
-      <integer>0</integer> <!-- 0 = larger of: 4 or (2 * CPU count) -->
+      <integer>1</integer> <!-- 0 = larger of: 4 or (2 * CPU count) -->
     </dict>
 
 
@@ -588,6 +588,32 @@
     <key>EnableWebAdmin</key>
     <true/>
 
+    <!-- Twisted -->
+    <key>Twisted</key>
+    <dict>
+      <key>twistd</key>
+      <string>/usr/lib/twisted-calendarserver/bin/twistd</string>
+    </dict>
+
+    <!-- Python Director -->
+    <key>PythonDirector</key>
+    <dict>
+      <key>pydir</key>
+      <string>/usr/share/pydirector/pydir.py</string>
+      <key>ControlSocket</key>
+      <string>/var/run/caldavd/caldavd-pydir.sock</string>
+    </dict>
+
+    <!-- Control Socket -->
+    <key>ControlSocket</key>
+    <string>/var/run/caldavd/caldavd.sock</string>
+
+    <!-- Memcached -->
+    <key>Memcached</key>
+    <dict>
+      <key>ServerEnabled</key>
+      <false/>
+    </dict>
 
   </dict>
 </plist>
diff -Naur calendarserver-2.4.dfsg.orig/setup.py calendarserver-2.4.dfsg/setup.py
--- calendarserver-2.4.dfsg.orig/setup.py	2009-05-08 02:42:08.000000000 +0530
+++ calendarserver-2.4.dfsg/setup.py	2010-08-24 21:59:30.000000000 +0530
@@ -110,7 +110,7 @@
                          "bin/calendarserver_export",
                          "bin/calendarserver_manage_principals"
                        ],
-    data_files       = [ ("caldavd", ["conf/caldavd.plist"]) ],
+    data_files       = [ ("/etc/caldavd", ["conf/caldavd.plist", "conf/sudoers.plist", "conf/auth/accounts.xml"]) ],
     ext_modules      = extensions,
     py_modules       = ["kqreactor", "memcacheclient"],
 )