diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 418d3f7a2..8b3be32ff 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -143,7 +143,6 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.16.55
 * linux-2.6.16.56
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index ec940c1e6..66d134e5f 100644
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -15,8 +15,19 @@
 # a space or a tab.
 ########################################################################
 
+### ACPI
+#
+ac
+battery
+button
+fan
+processor
+thermal
+video
+
+### parport
+#
 parport_pc
 lp
-button
 
 # End /etc/sysconfig/modules
diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 1c4a2f67d..a9981fd83 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -19,6 +19,11 @@
 #                                                                             #
 ###############################################################################
 
+	### Clean up our environment
+	#
+	delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
+	$< = $>;
+
 	require "/opt/pakfire/lib/functions.pl";
 	
 	my $interactive = 1;