diff -Naru apmud.orig/Batmon apmud/Batmon
--- apmud.orig/Batmon	2001-12-07 12:31:43.000000000 +0100
+++ apmud/Batmon	2005-12-09 22:53:49.000000000 +0100
@@ -297,7 +297,10 @@
 	set acpower $flag0
 	set t [expr {$acpower? $dpms_ac: $dpms_bat}]
 	if {$t != ""} {
-	    catch {exec /usr/X11R6/bin/xset dpms 0 0 $t}
+		set err [catch {exec /usr/X11R6/bin/xset dpms 0 0 $t}]
+		if { $err } {
+			catch {exec /usr/bin/xset dpms 0 0 $t}
+		}
 	}
     }
 }
diff -Naru apmud.orig/Makefile apmud/Makefile
--- apmud.orig/Makefile	2005-12-09 23:28:03.000000000 +0100
+++ apmud/Makefile	2005-12-09 22:30:50.000000000 +0100
@@ -50,7 +50,7 @@
 	install -m 755 -c snooze $(PREFIX)/sbin
 	install -m 755 -c wakebay $(PREFIX)/sbin
 	install -m 755 -c fblevel $(PREFIX)/sbin
-	install -m 755 -c xmouse $(PREFIX)/usr/X11R6/bin
+	install -m 755 -c xmouse $(PREFIX)/usr/bin
 	install -m 755 -c Batmon $(PREFIX)/usr/bin
 	install -m 644 -c -D pwrctl $(PREFIX)/etc/power/pwrctl
 	install -m 644 -c -D pwrctl-local $(PREFIX)/etc/power/pwrctl-local
diff -Naru apmud.orig/pwrctl apmud/pwrctl
--- apmud.orig/pwrctl	2001-12-16 21:05:38.000000000 +0100
+++ apmud/pwrctl	2005-12-09 21:53:14.000000000 +0100
@@ -67,6 +67,7 @@
 
 	(
 	/usr/X11R6/bin/xmessage -center -timeout 15 "$msg" || \
+	/usr/bin/xmessage -center -timeout 15 "$msg" || \
 	/usr/bin/wall "$msg"
 	) &
 }