diff --git a/ietf/ipr/testurl.list b/ietf/ipr/testurl.list
index 8a3c2a094..d3d706bcc 100644
--- a/ietf/ipr/testurl.list
+++ b/ietf/ipr/testurl.list
@@ -6,4 +6,5 @@
 200	/ipr/new-generic/		https://datatracker.ietf.org/public/ipr_generic.cgi
 200	/ipr/new-specific/		https://datatracker.ietf.org/public/ipr_notify.cgi
 200	/ipr/update/			https://datatracker.ietf.org/public/ipr_update_list.cgi
+200	/ipr/search/			https://datatracker.ietf.org/public/ipr_search.cgi
 #	/ipr/update
\ No newline at end of file
diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py
index 9922b871a..7496e1afc 100644
--- a/ietf/ipr/urls.py
+++ b/ietf/ipr/urls.py
@@ -8,6 +8,8 @@ urlpatterns = patterns('',
      (r'^update/$', views.updatelist),
      (r'^update/(?P<ipr_id>\d+)/$', views.update),
      (r'^new-(?P<type>(specific|generic|third-party))/$', views.new),
+     (r'^search/$', views.search),     
+     (r'^search/\?((option=(?P<option>[^&]*)|.*search=(?P<search>[^&]*)|submit=(?P<submit>[^&]*))&?)+/$', views.search),
 )
 
 queryset = models.IprDetail.objects.all()
diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py
index 6be33ce86..24e8ab418 100644
--- a/ietf/ipr/views.py
+++ b/ietf/ipr/views.py
@@ -4,6 +4,7 @@ from django.shortcuts import render_to_response as render
 from django.utils.html import escape
 from ietf.ipr.view_sections import section_table
 from ietf.ipr.view_new import new
+from ietf.idtracker.models import IETFWG
 
 def linebreaks(value):
     if value:
@@ -75,6 +76,11 @@ def update(request, ipr_id=None):
     return show(request, ipr_id)
 
 
+def search(request, option="", search="", submit=""):
+    wgs = IETFWG.objects.filter(group_type__group_type_id=1).exclude(group_acronym__acronym='2000').select_related().order_by('acronym.acronym')
+    return render("ipr/search.html", {"wgs": wgs})
+
+
 
 # ---- Helper functions ------------------------------------------------------
 
diff --git a/ietf/templates/ipr/search.html b/ietf/templates/ipr/search.html
new file mode 100644
index 000000000..baca2b496
--- /dev/null
+++ b/ietf/templates/ipr/search.html
@@ -0,0 +1,116 @@
+<html>
+<head><title>IPR Search Engine </title></head>
+<body>
+
+<center><br><br>
+   <font color="333366" size=4><b>Document Search</b></font>
+   <hr width="600"><br>
+   <table border="0" cellpadding="4" cellspacing="0" style="{padding:2px;border-width:1px;border-style:solid;border-color:305076}" width="580">
+      <form method="get">
+	 <input type="hidden" name="option" value="document_search">  
+	 <tr>
+
+	    <td bgcolor="E2DFD3"><font color="000000" face="Arial" Size=3> Enter I-D Filename ( draft-...)</td>
+	       <td bgcolor="E2DFD3"><input type="text" name="document_search" size="40"></td>
+	       <td bgcolor="E2DFD3"><input type="submit" value="SEARCH" width="15"></td></tr>
+      </form>
+      <script language="javascript"><!--
+	 function IsNumeric(strString) {
+	     var strValidChars = "0123456789.-";
+	     var strChar;
+	     var blnResult = true;
+
+	     if (strString.length == 0) return false;
+
+	     for (i = 0; i < strString.length && blnResult == true; i++)
+	     {
+		 strChar = strString.charAt(i);
+		 if (strValidChars.indexOf(strChar) == -1)
+		 {
+		     blnResult = false;
+		 }
+	     }
+	     return blnResult;
+	 }
+
+	 function check_numeric(val) {
+	     if (IsNumeric(val)) {
+		 return true;
+	     } else {
+		 alert ("Please enter numerics only");
+		 return false; 
+	     }
+	     return false;
+	 }
+	 // -->
+      </script>
+      <form name="form_rfc_search" method="get">
+	 <input type="hidden" name="option" value="rfc_search">
+	 <tr>
+
+	    <td bgcolor="E2DFD3"><font color="000000" face="Arial" Size=3> or Enter RFC Number</td>
+	       <td bgcolor="E2DFD3"><input type="text" name="rfc_search" size="8"></td>
+	       <td bgcolor="E2DFD3"><input type="submit" value="SEARCH" width="15" onClick="return check_numeric(document.form_rfc_search.rfc_search.value);"></td></tr>
+      </form>
+   </table>
+   <hr width="600"><br><br><br><br>
+   <font size=4 color="333366"><b>Keyword Search</b></font>
+
+   <hr width="600"><br>
+   <table border="0" cellpadding="4" cellspacing="0" style="{padding:2px;border-width:1px;border-style:solid;border-color:305076}" width="800">
+      <form method="get">
+	 <input type="hidden" name="option" value="patent_search">
+	 <tr>
+	    <td bgcolor="DDDDDD"><font color="000000" face="Arial" Size=3> Name of patent owner/applicant</td>
+	       <td bgcolor="DDDDDD"><input type="text" name="patent_search" size="20"></td>
+	       <td bgcolor="DDDDDD"><input type="submit" value="SEARCH" width="15"></td></tr>
+
+      </form>
+      <form method="get">
+	 <input type="hidden" name="option" value="patent_info_search">
+	 <tr>
+	    <td bgcolor="DDDDDD" width="350"><font color="000000" face="Arial" Size=3> Characters in patent information (Full/Partial)<br>
+	       <font size="-1" color="red">* The search string must contain at least three characters, including at least one digit, and include punctuation marks. For best results, please enter the entire string, or as much of it as possible.</font>
+	    </td>
+	    <td bgcolor="DDDDDD"><input type="text" name="patent_info_search" size="20"></td>
+
+	    <td bgcolor="DDDDDD"><input type="submit" value="SEARCH" width="15"></td></tr>
+      </form>
+      <form method="get">
+	 <input type="hidden" name="option" value="wg_search">
+	 <tr>
+	    <td bgcolor="DDDDDD"><font color="000000" face="Arial" Size=3> Working group name</td>
+	       <td bgcolor="DDDDDD">
+		  <select name="wg_search">
+		     <option value="">--Select WG</option>
+		     {% for wg in wgs %}
+		     <option value="{{ wg.group_acronym.acronym }}">{{ wg.group_acronym.acronym }}</option>{% endfor %}
+		  </select>
+	       </td>
+
+	       <td bgcolor="DDDDDD"><input type="submit" value="SEARCH" width="15"></td></tr>
+      </form>
+      <form method="get">
+	 <input type="hidden" name="option" value="title_search">
+	 <tr>
+	    <td bgcolor="DDDDDD"><font color="000000" face="Arial" Size=3> Words in document title</td>
+	       <td bgcolor="DDDDDD"><input type="text" name="title_search" size="50"></td>
+	       <td bgcolor="DDDDDD"><input type="submit" value="SEARCH" width="15"></td></tr>
+
+      </form>
+      <form method="get">
+	 <input type="hidden" name="option" value="ipr_title_search">
+	 <tr>
+	    <td bgcolor="DDDDDD"><font color="000000" face="Arial" Size=3> Words in IPR disclosure title</td>
+	       <td bgcolor="DDDDDD"><input type="text" name="ipr_title_search" size="50"></td>
+	       <td bgcolor="DDDDDD"><input type="submit" value="SEARCH" width="15"></td></tr>
+      </form>
+
+   </table>
+   <hr width="600"><br><br>
+   <center><a href="./ipr_disclosure.cgi"><img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0">IPR Disclosure Page</a>
+   </center><br>
+
+</body></html>
+
+

Name of patent owner/applicant
Characters in patent information (Full/Partial) + * The search string must contain at least three characters, including at least one digit, and include punctuation marks. For best results, please enter the entire string, or as much of it as possible. +
Working group name	+ +
Words in document title
Words in IPR disclosure title