diff -ruN e-smith-base-5.4.0.noapmd/createlinks e-smith-base-5.4.0/createlinks
--- e-smith-base-5.4.0.noapmd/createlinks	2013-02-06 14:14:56.801937994 -0700
+++ e-smith-base-5.4.0/createlinks	2013-02-06 14:15:56.759936868 -0700
@@ -559,7 +559,6 @@
     cpuspeed   	=> "06",
     'bootstrap-console'	=> "10",
     raidmonitor => "15",
-    apmd	=> "26",
     network  	=> "37",
     irqbalance 	=> "39",
     crond    	=> "40",
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/status e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/status
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/status	2013-01-31 08:53:10.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/status	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-disabled
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/type e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/type
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/type	2005-11-20 21:28:04.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/type	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-service
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/migrate/10apmdStatus e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10apmdStatus
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/migrate/10apmdStatus	2013-01-31 08:52:03.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10apmdStatus	1969-12-31 17:00:00.000000000 -0700
@@ -1,8 +0,0 @@
-{
-    my $apmd = $DB->get('apmd') || $DB->new_record('apmd', { type => 'service'});
-
-    my $arch = `/bin/uname -i`;
-    chomp($arch);
-
-    $apmd->set_prop("status", "disabled") unless $arch eq 'i386';
-}
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/templates/home/e-smith/ssl.key e-smith-base-5.4.0/root/etc/e-smith/templates/home/e-smith/ssl.key
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/templates/home/e-smith/ssl.key	2013-01-31 08:52:03.000000000 -0700
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/home/e-smith/ssl.key	2013-02-06 14:16:07.808937111 -0700
@@ -33,7 +33,6 @@
 	    qw(genrsa -rand),
 	    join(':',
 	    qw(
-		/proc/apm
 		/proc/cpuinfo
 		/proc/dma
 		/proc/filesystems
Binary files e-smith-base-5.4.0.noapmd/root/etc/e-smith/web/common/stop.jpg and e-smith-base-5.4.0/root/etc/e-smith/web/common/stop.jpg differ