diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index b780d11b1..dee7a8129 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -6,6 +6,7 @@ Changes in 3.2.0 Beta 8
 
 3)  Add xmodules file.
 
+-------------------------------------------------------------------------------
 Changes in 3.2.0 Beta 7
 
 1)  Fix mark/mask validation.
@@ -16,6 +17,7 @@ Changes in 3.2.0 Beta 7
 
 4)  Avoid fatal error after missing forwardUPnP rule warning.
 
+-------------------------------------------------------------------------------
 Changes in 3.2.0 Beta 6
 
 1)  Fix tc "notfound" errors when 'restart' is run out of ip-up.local.
@@ -30,6 +32,7 @@ Changes in 3.2.0 Beta 6
 
 6)  Change interraction of 'track' and PREROUTING marking.
 
+-------------------------------------------------------------------------------
 Changes in 3.2.0 Beta 5
 
 1)  Fix compilation problem on LEAF Bering.
@@ -49,6 +52,7 @@ Changes in 3.2.0 Beta 5
 
 8)  Clear SUBSYSLOCK on Debian/Ubuntu installs.
 
+-------------------------------------------------------------------------------
 Changes in 3.2.0 Beta 4
 
 1)  Fix 'routeback' with bridge ports.
@@ -67,6 +71,7 @@ Changes in 3.2.0 Beta 3
 
 3)  Fix SAME/ADD_SNAT_ALIASES interaction.
 
+-------------------------------------------------------------------------------
 Changes in 3.2.0 Beta 2
 
 1)  Make "shorewall start -f" work correctly.
@@ -77,6 +82,7 @@ Changes in 3.2.0 Beta 2
 
 4)  Implement 'logdrop' and 'logreject'
 
+-------------------------------------------------------------------------------
 Changes in 3.1.x. and 3.2.x
 
 1) Removal of dynamic zones.
diff --git a/Shorewall/functions b/Shorewall/functions
index 3c52e3620..0cc046ddd 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -375,7 +375,7 @@ loadmodule() # $1 = module name, $2 - * arguments
 	moduleloader=insmod
     fi
 
-    if [ -z "$(lsmod | grep $modulename)" ]; then
+    if ! list_search $modulename $MODULES ; then
 	shift
 
 	for suffix in $MODULE_SUFFIX ; do
@@ -391,7 +391,8 @@ loadmodule() # $1 = module name, $2 - * arguments
 			;;
 		esac
 
-		return
+		MODULES=$(lsmod | cut -d ' ' -f1)
+		break
 	    fi
 	done
     fi
@@ -403,6 +404,7 @@ loadmodule() # $1 = module name, $2 - * arguments
 reload_kernel_modules() {
 
     [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter
+    MODULES=$(lsmod | cut -d ' ' -f1)
 
     while read command; do
 	eval $command
@@ -423,6 +425,7 @@ load_kernel_modules()
     modules=$(find_file modules)
 
     if [ -f $modules -a -d $MODULESDIR ]; then
+	MODULES=$(lsmod | cut -d ' ' -f1)
 	progress_message "Loading Modules..."
 	. $modules
     fi