diff --git a/modules/find.pl b/modules/find.pl
new file mode 100644
index 00000000..e1009a38
--- /dev/null
+++ b/modules/find.pl
@@ -0,0 +1,57 @@
+# Copyright (C) 2007  Alex Schroeder <alex@emacswiki.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+#    Free Software Foundation, Inc.
+#    59 Temple Place, Suite 330
+#    Boston, MA 02111-1307 USA
+
+$ModulesDescription .= '<p>$Id: find.pl,v 1.1 2007/07/03 15:49:14 as Exp $</p>';
+
+$Action{find} = \&DoFind;
+
+sub DoFind {
+  my $string = GetParam('query','');
+  my $raw = GetParam('raw','');
+  if ($string eq '') {
+    DoIndex();
+    return;
+  }
+  if ($raw) {
+    print GetHttpHeader('text/plain'), RcTextItem('title', Ts('Search for: %s', $string)),
+      RcTextItem('date', TimeToText($Now)), RcTextItem('link', $q->url(-path_info=>1, -query=>1)), "\n"
+	if GetParam('context',1);
+  } else {
+    print GetHeader('', QuoteHtml(Ts('Search for: %s', $string))),
+      $q->start_div({-class=>'content search'});
+    my @elements = (ScriptLink('action=rc;rcfilteronly=' . UrlEncode($string),
+			       T('View changes for these pages')));
+    print $q->p({-class=>'links'}, @elements);
+  }
+  my $match = quotemeta($string);
+  my @results = grep(/$match/i, AllPagesList());
+  if (@results) {
+    print $q->start_div({-class=>'title'}),
+      $q->p({-class=>'intro'},
+	    T('Matching page names:'));
+    foreach (@results) { PrintPage($_) }
+    print $q->end_div();
+  }
+  if (GetParam('context',1)) {
+    push(@results, SearchTitleAndBody($string, \&PrintSearchResult, HighlightRegex($string)));
+  } else {
+    push(@results, SearchTitleAndBody($string, \&PrintPage));
+  }
+  print SearchResultCount($#results + 1), $q->end_div() unless $raw;
+  PrintFooter() unless $raw;
+}