diff --git a/configure.zcml b/configure.zcml
index e45b55e..b3a1c42 100644
--- a/configure.zcml
+++ b/configure.zcml
@@ -319,6 +319,7 @@
   <include package=".knowledge" />
   <include package=".organize" />
   <include package=".process" />
+  <include package=".search" />
   <include package=".browser" />
 
 </configure>
diff --git a/organize/configure.zcml b/organize/configure.zcml
index b11eb2c..1b2611e 100644
--- a/organize/configure.zcml
+++ b/organize/configure.zcml
@@ -50,7 +50,7 @@
   <zope:adapter
         name="mystuff"
         for="loops.interfaces.IConcept
-            zope.publisher.interfaces.browser.IBrowserRequest"
+             zope.publisher.interfaces.browser.IBrowserRequest"
         provides="zope.interface.Interface"
         factory="loops.organize.browser.MyStuff"
         permission="zope.View"
@@ -66,7 +66,7 @@
       factory="cybertools.browser.widget.SimpleListDisplayWidget"
       permission="zope.Public"
       />
-  
+
   <!-- member registration -->
 
   <zope:adapter factory="loops.organize.member.MemberRegistrationManager"
diff --git a/search/README.txt b/search/README.txt
new file mode 100755
index 0000000..94ee36f
--- /dev/null
+++ b/search/README.txt
@@ -0,0 +1,6 @@
+===================================================================
+loops.search - Provide search functionality for the loops framework
+===================================================================
+
+  ($Id$)
+
diff --git a/search/__init__.py b/search/__init__.py
new file mode 100644
index 0000000..4bc90fb
--- /dev/null
+++ b/search/__init__.py
@@ -0,0 +1,4 @@
+"""
+$Id$
+"""
+
diff --git a/search/browser/__init__.py b/search/browser/__init__.py
new file mode 100644
index 0000000..4bc90fb
--- /dev/null
+++ b/search/browser/__init__.py
@@ -0,0 +1,4 @@
+"""
+$Id$
+"""
+
diff --git a/search/browser/base.py b/search/browser/base.py
new file mode 100644
index 0000000..e792680
--- /dev/null
+++ b/search/browser/base.py
@@ -0,0 +1,48 @@
+#
+#  Copyright (c) 2004 Helmut Merz helmutm@cy55.de
+#
+#  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
+#
+
+"""
+Definition of basic view classes and other browser related stuff for the
+loops.search package.
+
+$Id$
+"""
+
+from zope import interface, component
+from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.cachedescriptors.property import Lazy
+from zope.formlib.namedtemplate import NamedTemplate, NamedTemplateImplementation
+from zope.i18nmessageid import MessageFactory
+
+from loops.browser.common import BaseView
+
+_ = MessageFactory('zope')
+
+
+search_macros = NamedTemplateImplementation(
+                    ViewPageTemplateFile('search.pt'))
+
+
+class Search(BaseView):
+
+    template = NamedTemplate('loops.search_macros')
+
+    @Lazy
+    def macro(self):
+        return self.template.macros['search']
+
diff --git a/search/browser/configure.zcml b/search/browser/configure.zcml
new file mode 100644
index 0000000..5d56003
--- /dev/null
+++ b/search/browser/configure.zcml
@@ -0,0 +1,26 @@
+<!-- $Id$ -->
+
+<configure
+    xmlns:zope="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="zope">
+
+  <!-- named templates -->
+
+  <zope:adapter
+      factory="loops.search.browser.base.search_macros"
+      for="loops.browser.common.BaseView"
+      name="loops.search_macros" />
+
+  <!-- the real view -->
+
+  <zope:adapter
+      name="search"
+      for="loops.interfaces.IConcept
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.interface.Interface"
+      factory="loops.search.browser.base.Search"
+      permission="zope.View"
+      />
+
+</configure>
diff --git a/search/browser/search.pt b/search/browser/search.pt
new file mode 100644
index 0000000..5ea62cb
--- /dev/null
+++ b/search/browser/search.pt
@@ -0,0 +1,22 @@
+<metal:search define-macro="search">
+  <div>
+    <h3 tal:attributes="class string:content-$level;
+                        ondblclick item/openEditWindow">
+      Search
+    </h3>
+
+    <div metal:define-macro="search_form">
+      <fieldset class="box">
+        <form action=".">
+          <input name="search" />
+        </form>
+      </fieldset>
+    </div>
+
+    <div metal:define-macro="search_results">
+      <fieldset class="box">
+      </fieldset>
+    </div>
+
+  </div>
+</metal:search>
diff --git a/search/configure.zcml b/search/configure.zcml
new file mode 100644
index 0000000..7ee4eed
--- /dev/null
+++ b/search/configure.zcml
@@ -0,0 +1,10 @@
+<!-- $Id$ -->
+
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    i18n_domain="zope"
+    >
+
+  <include package=".browser" />
+
+</configure>
diff --git a/search/tests.py b/search/tests.py
new file mode 100755
index 0000000..4edec1b
--- /dev/null
+++ b/search/tests.py
@@ -0,0 +1,26 @@
+# $Id$
+
+import unittest, doctest
+from zope.testing.doctestunit import DocFileSuite
+from zope.interface.verify import verifyClass
+
+#from loops.search.interfaces import ...
+
+
+class Test(unittest.TestCase):
+    "Basic tests for the loops.search package."
+
+    def testBase(self):
+        pass
+
+
+def test_suite():
+    flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
+    return unittest.TestSuite((
+                unittest.makeSuite(Test),
+                DocFileSuite('README.txt',
+                             optionflags=flags,),
+           ))
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')