diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files
index 409e5fe8a..f1a51e621 100644
--- a/config/rootfiles/core/91/filelists/files
+++ b/config/rootfiles/core/91/filelists/files
@@ -1,2 +1,3 @@
 etc/system-release
 etc/issue
+srv/web/ipfire/cgi-bin/dhcp.cgi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 1ccc65412..90accb3c0 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -423,6 +423,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
diff --git a/doc/language_issues.en b/doc/language_issues.en
index b7be8627b..1f1c78d61 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -450,6 +450,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 086dfbdc9..fe8b72624 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -973,6 +974,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 47ee3fb3f..fee481d25 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -390,6 +390,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -984,6 +985,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 098f4401e..2f61cb61b 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
@@ -713,6 +714,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: uncheck all
 WARNING: untranslated string: vpn statistic n2n
 WARNING: untranslated string: vpn statistic rw
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 602441d0b..fadc79272 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -443,6 +443,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -755,6 +756,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
 WARNING: untranslated string: software version
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 086dfbdc9..fe8b72624 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -973,6 +974,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 94724d4c2..a9e900134 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -384,6 +384,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
 WARNING: translation string unused: ovpn_fastio
@@ -967,6 +968,7 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
+WARNING: untranslated string: search
 WARNING: untranslated string: server restart
 WARNING: untranslated string: show dh
 WARNING: untranslated string: show tls-auth key
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6f846c738..d94953a84 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn device
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
@@ -690,6 +691,7 @@ WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: search
 WARNING: untranslated string: uncheck all
 WARNING: untranslated string: vpn statistic n2n
 WARNING: untranslated string: vpn statistic rw
diff --git a/doc/language_missings b/doc/language_missings
index 9fdc0d276..03a9e3f35 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -447,6 +447,7 @@
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < show dh
 < snat new source ip address
@@ -1032,6 +1033,7 @@
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < Set time on boot
 < show dh
@@ -1581,6 +1583,7 @@
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < show dh
 < snat new source ip address
@@ -2133,6 +2136,7 @@
 < red1
 < samba join a domain
 < samba join domain
+< search
 < server restart
 < show dh
 < snat new source ip address
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 9a7d983ee..e75207a21 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -857,12 +857,31 @@ print <<END
 </tr>
 </table>
 </form>
+<hr />
 END
 ;
 #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order'
 
+# Search for static leases
+my $search_query = $dhcpsettings{'q'};
+
+if (scalar @current2 >= 10) {
+	print <<END;
+		<form method="POST" action="#search">
+			<a name="search"></a>
+			<table width='100%'>
+				<tr>
+					<td>
+						<input type="text" name="q" value="$search_query">
+						<input type="submit" value="$Lang::tr{'search'}">
+					</td>
+				</tr>
+			</table>
+		</form>
+END
+}
+
 print <<END
-<hr />
 <table width='100%' class='tbl'>
 <tr>
     <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
@@ -918,6 +937,11 @@ foreach my $line (@current2) {
 	$gdesc = $Lang::tr{'click to enable'}; 
     }
 
+    # Skip all entries that do not match the search query
+    if ($search_query ne "") {
+	next if (!grep(/$search_query/, @temp));
+    }
+
     if ($dhcpsettings{'KEY2'} eq $key) {
 	print "<tr>";
 	$col="bgcolor='${Header::colouryellow}'";
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index defb632ce..8adefdf60 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1950,6 +1950,7 @@
 'save settings' => 'Einstellungen speichern',
 'save-adv-options' => 'Erweiterte Optionen speichern',
 'script name' => 'Skriptname:',
+'search' => 'Suchen',
 'secondary dns' => 'Sekundärer DNS:',
 'secondary ntp server' => 'Sekundärer NTP-Server',
 'secondary wins server address' => 'Sekundäre WINS-Server Adresse',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 80c05520b..43601c86e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1982,6 +1982,7 @@
 'save settings' => 'Save settings',
 'save-adv-options' => 'Save advanced options',
 'script name' => 'Script name:',
+'search' => 'Search',
 'secondary dns' => 'Secondary DNS:',
 'secondary ntp server' => 'Secondary NTP server',
 'secondary wins server address' => 'Secondary WINS server address',