diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh
index 658a7766a..957123918 100755
--- a/Shorewall-common/fallback.sh
+++ b/Shorewall-common/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.4.2
+VERSION=3.9.2
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index 8854992de..48ef5d7df 100755
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.4.2
+VERSION=3.9.1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh
index 0f5d903f1..65290b192 100755
--- a/Shorewall-common/uninstall.sh
+++ b/Shorewall-common/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=3.4.2
+VERSION=3.9.2
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 148535e22..6286b6848 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -59,7 +59,7 @@ our %globals  =   ( SHAREDIR => '/usr/share/shorewall' ,
 		    CONFDIR =>  '/etc/shorewall',
 		    SHAREDIRPL => '/usr/share/shorewall-perl/',
 		    LOGPARMS => '',
-		    VERSION =>  '3.9.0-1',
+		    VERSION =>  '3.9.1',
 		  );
 
 #
@@ -647,7 +647,7 @@ sub ensure_config_path( $ ) {
     unless ( $config{CONFIG_PATH} ) {
 	fatal_error "$f does not exist" unless -f $f;
 	
-	open $currentfile , '<', $f or fatal_error "Cannot open $f";
+	open_file $f;
 
 	while ( read_a_line ) {
 	    if ( $line =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
diff --git a/Shorewall-perl/compiler.pl b/Shorewall-perl/compiler.pl
index 1b33d8d07..2daa8d753 100755
--- a/Shorewall-perl/compiler.pl
+++ b/Shorewall-perl/compiler.pl
@@ -69,7 +69,9 @@ INIT {
 #    Generate the 'initialize()' function.
 #
 
-sub generate_script_1 {
+sub generate_script_1() {
+    my $export = $_[0];
+
     copy $globals{SHAREDIRPL} . 'prog.header';
 
     my $date = localtime;
@@ -488,22 +490,16 @@ sub generate_script_2 () {
     save_progress_message 'Initializing...';
     
     if ( $export ) {
-	my $mf = find_file 'modules';
-
-	if ( $mf ne "$globals{SHAREDIR}/module" && -f $mf ) {
-
-	    emitj( 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir',
-		   'cat > ${VARDIR}/.modules << EOF'
-		   );
-
-	    open MF, $mf or fatal_error "Unable to open $mf: $!";
-
-	    while ( my $line = <MF> ) { emit_as_is $line if $line =~ /^\s*loadmodule\b/; }
-
-	    close MF;
-
-	    emit_unindented "EOF\n";
+	my $fn = find_file 'modules';
 
+	if ( $fn ne "$globals{SHAREDIR}/modules" && -f $fn ) {
+	    emit 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir';
+	    emit 'cat > ${VARDIR}/.modules << EOF';
+	    open_file $fn;
+	    while ( read_a_line ) {
+		emit_unindented $line;
+	    }
+	    emit_unindented 'EOF';
 	    emit 'reload_kernel_modules < ${VARDIR}/.modules';
 	} else {
 	    emit 'load_kernel_modules Yes';
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index 702d1cbce..985f6e220 100755
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.0-1
+VERSION=3.9.1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index fdfcdfe4d..b09c38f2c 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -1,5 +1,5 @@
 %define name shorewall-perl
-%define version 3.9.0
+%define version 3.9.1
 %define release 1
 %define prefix /usr
 
@@ -80,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sat Apr 07 2007 Tom Eastep tom@shorewall.net
+- Initial version 3.9.1-1
 * Sat Mar 24 2007 Tom Eastep tom@shorewall.net
 - Initial version 3.9.0-1