--- a/powerd	2010-06-16 20:31:20.000000000 +0000
+++ b/powerd	2010-06-16 20:31:57.000000000 +0000
@@ -370,7 +370,7 @@
 #
 
 XO=;
-CONFIGDIR=/etc/powerd
+CONFIGDIR=/etc/olpc-powerd
 
 VERSIONFILE=$CONFIGDIR/version
 CONFIGFILE=$CONFIGDIR/powerd.conf
--- a/powerd-config	2010-06-16 20:32:19.000000000 +0000
+++ b/powerd-config	2010-06-16 20:32:27.000000000 +0000
@@ -28,7 +28,7 @@
 
 INHIBITDIR=/var/run/powerd-inhibit-suspend
 INHIBIT_BY_TOUCH=$INHIBITDIR/.fake_activity
-CONFIGDIR=/etc/powerd
+CONFIGDIR=/etc/olpc-powerd
 CONFIGFILE=$CONFIGDIR/powerd.conf
 TMPCONFIG=$CONFIGFILE.tmp
 NEWCONFIG=$TMPCONFIG.new