diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi
index 4623d72c2..3afaee2c4 100644
--- a/html/cgi-bin/upnp.cgi
+++ b/html/cgi-bin/upnp.cgi
@@ -26,11 +26,21 @@ my %selected= () ;
 
 my %servicenames =
 (
-	'UPnP Daemon' => 'upnpd',
+       'UPnP Daemon' => 'upnpd',
 );
 
 &Header::showhttpheaders();
+############################################################################################################################
+############################################### Setzen von Standartwerten ##################################################
 
+$upnpsettings{'DEBUGMODE'} = '3';
+$upnpsettings{'FORWARDRULES'} = 'yes';
+$upnpsettings{'FORWARDCHAIN'} = 'FORWARD';
+$upnpsettings{'PREROUTINGCHAIN'} = 'PORTFW';
+$upnpsettings{'DOWNSTREAM'} = '900000';
+$upnpsettings{'UPSTREAM'} = '16000000';
+$upnpsettings{'DESCRIPTION'} = 'gatedesc.xml';
+$upnpsettings{'XML'} = '/etc/linuxigd';
 $upnpsettings{'ENABLED'} = 'off';
 $upnpsettings{'GREEN'} = 'on';
 $upnpsettings{'BLUE'} = 'off';
@@ -44,37 +54,57 @@ $upnpsettings{'ACTION'} = '';
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
-############################################################################################################################
+################################################### Speichern der Config ###################################################
 
 if ($upnpsettings{'ACTION'} eq $Lang::tr{'save'})
 {
-	&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
-} 
+&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
+
+       open (FILE, ">${General::swroot}/upnp/upnpd.conf") or die "Can't save the upnp config: $!";
+       flock (FILE, 2);
+
+print FILE <<END
+
+# UPnP Config by Ipfire Project
+
+debug_mode = $upnpsettings{'DEBUGMODE'}
+insert_forward_rules = $upnpsettings{'FORWARDRULES'}
+forward_chain_name = $upnpsettings{'FORWARDCHAIN'}
+prerouting_chain_name = $upnpsettings{'PREROUTINGCHAIN'}
+upstream_bitrate = $upnpsettings{'DOWNSTREAM'}
+downstream_bitrate = $upnpsettings{'UPSTREAM'}
+description_document_name = $upnpsettings{'DESCRIPTION'}
+xml_document_path = $upnpsettings{'XML'}
+
+END
+;
+close FILE;
+}
 elsif ($upnpsettings{'ACTION'} eq 'Start')
 {
-	$upnpsettings{'ENABLED'} = 'on';
-	&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
-	system('/usr/local/bin/upnpctrl start');
-} 
+       $upnpsettings{'ENABLED'} = 'on';
+       &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
+       system('/usr/local/bin/upnpctrl start');
+}
 elsif ($upnpsettings{'ACTION'} eq 'Stop')
 {
-	$upnpsettings{'ENABLED'} = 'off';
-	&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
-	system('/usr/local/bin/upnpctrl stop');
-} 
+       $upnpsettings{'ENABLED'} = 'off';
+       &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
+       system('/usr/local/bin/upnpctrl stop');
+}
 elsif ($upnpsettings{'ACTION'} eq $Lang::tr{'restart'})
 {
-	&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
-	system('/usr/local/bin/upnpctrl restart');
+       &General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
+       system('/usr/local/bin/upnpctrl restart');
 }
 
 &General::readhash("${General::swroot}/upnp/settings", \%upnpsettings);
 
 if ($errormessage) {
-	&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-	print "<class name='base'>$errormessage\n";
-	print "&nbsp;</class>\n";
-	&Header::closebox();
+       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+       print "<class name='base'>$errormessage\n";
+       print "&nbsp;</class>\n";
+       &Header::closebox();
 }
 
 $checked{'GREEN'}{'on'} = '';
@@ -89,53 +119,65 @@ $checked{'BLUE'}{"$upnpsettings{'BLUE'}"} = 'checked';
 
 &Header::openbox('100%', 'center', 'UPnP');
 print <<END
-	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-	<table width='400' cellspacing='0'>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='400' cellspacing='0'>
 END
 ;
-	if ( $message ne "" ) {
-		print "<tr><td colspan='3' align='center'><font color='red'>$message</font>";
-	}
+       if ( $message ne "" ) {
+               print "<tr><td colspan='3' align='center'><font color='red'>$message</font>";
+       }
 
-	my $lines = 0;
-	my $key = '';
-	foreach $key (sort keys %servicenames)
-	{
-		if ($lines % 2) {
-			print "<tr bgcolor='${Header::table1colour}'>\n"; }
-		else {
-			print "<tr bgcolor='${Header::table2colour}'>\n"; }
-		print "<td align='left'>$key\n";
-		my $shortname = $servicenames{$key};
-		my $status = &isrunning($shortname);
-		print "$status\n";
-		$lines++;
-	}
-	print <<END
-		<tr><td><b>Alle Dienste:</b></td><td colspan='2'>
-		<input type='submit' name='ACTION' value='Start' /> 
-		<input type='submit' name='ACTION' value='Stop' /> 
-		<input type='submit' name='ACTION' value='$Lang::tr{'restart'}' />
-	</table>
-	</form>
-	<hr />
-	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-	<table width='500'>
-	<tr><td colspan='2' align='left'><b>$Lang::tr{'options'}</b>
-        <tr><td align='left'>$Lang::tr{'interfaces'}
-	     <td align='left'>&nbsp;<td><input type='checkbox' name='GREEN' $checked{'GREEN'}{'on'} /> <font size='2' color='$Header::colourgreen'><b>$Lang::tr{'green'} - $netsettings{'GREEN_DEV'}</b></font>
+       my $lines = 0;
+       my $key = '';
+       foreach $key (sort keys %servicenames)
+       {
+               if ($lines % 2) {
+                       print "<tr bgcolor='${Header::table1colour}'>\n"; }
+               else {
+                       print "<tr bgcolor='${Header::table2colour}'>\n"; }
+               print "<td align='left'>$key\n";
+               my $shortname = $servicenames{$key};
+               my $status = &isrunning($shortname);
+               print "$status\n";
+               $lines++;
+       }
+       print <<END
+               <tr><td><b>Alle Dienste:</b></td><td colspan='2'>
+               <input type='submit' name='ACTION' value='Start' />
+               <input type='submit' name='ACTION' value='Stop' />
+               <input type='submit' name='ACTION' value='$Lang::tr{'restart'}' />
+       </table>
+       </form>
+       <hr />
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='500'>
+       <tr><td colspan='2' align='left'><b>$Lang::tr{'options'}</b>
+       <tr><td align='left'>$Lang::tr{'interfaces'}
+            <td align='left'>&nbsp;<td><input type='checkbox' name='GREEN' $checked{'GREEN'}{'on'} /> <font size='2' color='$Header::colourgreen'><b>$Lang::tr{'green'} - $netsettings{'GREEN_DEV'}</b></font>
 END
 ;
-         if (&Header::blue_used()){
-         print <<END
-         <tr><td align='left'>&nbsp;<td><input type='checkbox' name='BLUE' $checked{'BLUE'}{'on'} /> <font size='2' color='$Header::colourblue'><b>$Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'}</b></font>
-END
-;
-                                    }
+        if (&Header::blue_used()){
         print <<END
-	<tr><td colspan='2' align='right'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
-	</table>
-	</form>
+        <tr><td align='left'>&nbsp;<td><input type='checkbox' name='BLUE' $checked{'BLUE'}{'on'} /> <font size='2' color='$Header::colourblue'><b>$Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'}</b></font>
+END
+;
+                                   }
+       print <<END
+       </table>
+
+<table width='95%' cellspacing='0'>
+<tr><td align='left'>Debug Mode:</td><td><input type='text' name='DEBUGMODE' value='$upnpsettings{'DEBUGMODE'}' size="30"></input></td></tr>
+<tr><td align='left'>Forward Rules:</td><td><input type='text' name='FORWARDRULES' value='$upnpsettings{'FORWARDRULES'}' size="30"></input></td></tr>
+<tr><td align='left'>Forward Chain:</td><td><input type='text' name='FORWARDCHAIN' value='$upnpsettings{'FORWARDCHAIN'}' size="30"></input></td></tr>
+<tr><td align='left'>Prerouting Chain:</td><td><input type='text' name='PREROUTINGCHAIN' value='$upnpsettings{'PREROUTINGCHAIN'}' size="30"></input></td></tr>
+<tr><td align='left'>Down Stream:</td><td><input type='text' name='DOWNSTREAM' value='$upnpsettings{'DOWNSTREAM'}' size="30"></input></td></tr>
+<tr><td align='left'>Up Strean:</td><td><input type='text' name='UPSTREAM' value='$upnpsettings{'UPSTREAM'}' size="30"></input></td></tr>
+<tr><td align='left'>Description Document:</td><td><input type='text' name='DESCRIPTION' value='$upnpsettings{'DESCRIPTION'}' size="30"></input></td></tr>
+<tr><td align='left'>XML Document:</td><td><input type='text' name='XML' value='$upnpsettings{'XML'}' size="30"></input></td></tr>
+<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
+</table></form>
+<br></br>
+<hr></hr>
 END
 ;
 &Header::closebox();
@@ -148,34 +190,33 @@ END
 
 sub isrunning
 {
-	my $cmd = $_[0];
-	my $status = "<td bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
-	my $pid = '';
-	my $testcmd = '';
-	my $exename;
+       my $cmd = $_[0];
+       my $status = "<td bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+       my $pid = '';
+       my $testcmd = '';
+       my $exename;
 
-	$cmd =~ /(^[a-z]+)/;
-	$exename = $1;
+       $cmd =~ /(^[a-z]+)/;
+       $exename = $1;
 
-	if (open(FILE, "/var/run/${cmd}.pid"))
-	{
- 		$pid = <FILE>; chomp $pid;
-		close FILE;
-		if (open(FILE, "/proc/${pid}/status"))
-		{
-			while (<FILE>)
-			{
-				if (/^Name:\W+(.*)/) {
-					$testcmd = $1; }
-			}
-			close FILE;
-			if ($testcmd =~ /$exename/)
-			{
-				$status = "<td bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
-			}
-		}
-	}
+       if (open(FILE, "/var/run/${cmd}.pid"))
+       {
+               $pid = <FILE>; chomp $pid;
+               close FILE;
+               if (open(FILE, "/proc/${pid}/status"))
+               {
+                       while (<FILE>)
+                       {
+                               if (/^Name:\W+(.*)/) {
+                                       $testcmd = $1; }
+                       }
+                       close FILE;
+                       if ($testcmd =~ /$exename/)
+                       {
+                               $status = "<td bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+                       }
+               }
+       }
 
-	return $status;
+       return $status;
 }
-