diff --git a/en/projects/summerofcode.sgml b/en/projects/summerofcode.sgml
index de8231b00f..d540ce83f7 100644
--- a/en/projects/summerofcode.sgml
+++ b/en/projects/summerofcode.sgml
@@ -1,137 +1,164 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/summerofcode.sgml,v 1.58 2006/10/26 09:16:26 joel Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/summerofcode.sgml,v 1.59 2007/02/02 07:41:09 joel Exp $">
 <!ENTITY title "FreeBSD Summer Projects">
 <!ENTITY % navinclude.developers "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 ]>
 
 <html>
 &header;
 
-<p>The FreeBSD Project was a successful mentoring organization in the
+<p>The FreeBSD Project is pleased to participate as a mentoring organization in the
   Google <a href="http://code.google.com/summerofcode.html">Summer of
-  Code</a>.  This program funds students to contribute to an open
+  Code</a> 2007.  This program funds students to contribute to an open
   source project over the summer break.  We had dozens of successful
   students working on FreeBSD as part of this program in <a
   href="&base;/summerofcode-2005.html">2005</a> and <a
   href="&base;/summerofcode-2006.html">2006</a>.</p>
 
 <ul>
   <li><a href="#students">Past Student Projects</a></li>
   <li><a href="#ideas">Example Proposal Ideas</a></li>
   <li><a href="#mentors">Possible Mentors</a></li>
   <li><a href="#proposals">Proposal Guidelines</a></li>
   <li><a href="#infrastructure">Infrastructure Provided to Students</a></li>
   <li><a href="#faq">Frequently Asked Questions</a></li>
 </ul>
 
 <a name="students"></a>
 <h2>Past Student Projects</h2>
 
 <p>For a complete list of student projects from previous years,
 visit:</p>
 <ul>
   <li><a href="&base;/projects/summerofcode-2006.html">Summer of Code 2006 FreeBSD
   Projects Summary</a></li>
   <li><a href="&base;/projects/summerofcode-2005.html">Summer of Code 2005 FreeBSD
   Projects Summary</a></li>
 </ul>
 
 <p>See also our <a
 href="http://wiki.freebsd.org/moin.cgi/SummerOfCode2006">FreeBSD
 SoC2006 Wiki</a> and the Google
 <a href="http://code.google.com/soc/freebsd/about.html">FreeBSD SoC 2006</a> pages.</p>
 
 <a name="ideas"></a>
 <h2>Example Proposal Ideas</h2>
 
 <p>Please see the general <a
   href="&base;/projects/ideas/index.html">FreeBSD Project Ideas</a>
   page. The recent <a href="&base;/news/status">Developer Status
   Reports</a> are also a good source of information about upcoming
-  projects.  A Summer of Code-specific addendum may be posted here in
+  projects.</p>
+
+<!-- Do we want a summer of code-specific addendum here?
+  A Summer of Code-specific addendum may be posted here in
   Spring 2007.</p>
+-->
 
 <a name="mentors"></a>
 <h2>Mentors</h2>
 
-<p>A list of potential mentors will be posted here when the 2007
-  program is announced.</p>
+<p>A list of potential mentors will be posted here shortly.</p>
 
 <a name="proposals"></a>
 <h2>Proposal Guidelines</h2>
 
 <p>Students are responsible for writing a proposal and submitting it
   to Google before the application deadline.  The following outline
   was adapted from the Perl Foundation <a
   href="http://www.perlfoundation.org/gc/grants/proposals.html">open
   source proposal HOWTO</a>.  A strong proposal will include:</p>
 
 
   <ul>
     <li><strong>Name</strong></li>
 
     <li><strong>Email</strong></li>
 
     <li><strong>Project Title</strong></li>
 
     <li><strong>Possible Mentor</strong> <em>(optional)</em></li>
 
     <li><strong>Benefits to the FreeBSD Community</strong> - a good
       project will not just be fun to work on, but also generally
       useful to others.</li>
 
     <li><strong>Deliverables</strong> - It is very important to list
   quantifiable results here e.g. 
       <ul>
         <li>"Improve X modules in ways Y and Z."</li>
         <li>"Write 3 new man pages for the new interfaces."</li>
         <li>"Improve test coverage by writing X more unit/regression
         tests."</li>
         <li>"Improve performance in FOO by X%."</li>
       </ul>
     </li>
 
     <li><strong>Project Schedule</strong> - How long will the project
       take? When can you begin work?</li>
 
     <li><strong>Availability</strong> - How many hours per week can
       you spend working on this?  What other obligations do you have
       this summer?</li>
 
     <li><strong>Bio</strong> - Who are you? What makes you the best
       person to work on this project?</li>
   </ul>
 
 <a name="infrastructure"></a>
 <h2>Infrastructure Provided to Students</h2>
 
 <p>In 2005 and 2006, the FreeBSD Project provided access to the FreeBSD
 Perforce revision control infrastructure in order to facilitate
 student collaboration, provide public access and archiving for the
 on-going student projects, and to help mentors and the community
 monitor on-going work.  It is expected that students participating in
 future programs will be offered the same facilities.
 Students will also be asked to maintain wiki
 pages on their on-going projects.  In the past, e-mail, IRC, and
 instant messaging have proven popular among students and mentors, and
 students participating in the FreeBSD summer program are encouraged to
 use these and other electronic communication mechanisms to become
 active in the community.</p>
 
 <a name="faq"></a>
 <h2>Frequently Asked Questions</h2>
 
 <ul>
-  <li><p><strong>What about Summer of 2007?</strong></p>
 
-    <p>We again hope to be able to work with Google and participate in
-a sponsored Google Summer of Code program in 2007.  Please check
-back in Spring 2007 for details.</p>
-  </li>
+  <li><p><strong>Am I eligible?</strong></p>
+
+    <p>Please see the Google <a
+      href="http://code.google.com/support/bin/topic.py?topic=10442">FAQ</a>
+      for all questions about eligibility.</p></li>
+
+  <li><p><strong>Where can I find more information about being a
+      student or mentor in this program?</strong></p>
+
+    <p>Please see the program wiki <a
+      href="http://code.google.com/p/google-summer-of-code/">here</a>.</p></li>
+
+  <li><p><strong>When does the application period begin?</strong></p>
+
+    <p><strong>March 2007</strong></p></li>
+
+  <li><p><strong>Where do I send my proposal?</strong></p>
+
+    <p>Proposals must be sent directly to Google when the application
+      period begins.</p>
+
+  <li><p><strong>What projects were completed successfully by students
+    last summer?</strong></p>
+
+    <p>Please see the <a href="summerofcode-2006.html">2006 FreeBSD
+      Summer of Code</a> and <a href="summerofcode-2005.html">2005
+      FreeBSD Summer of Code</a> pages for a list of the completed
+      projects from previous years.</p></li>
+
 </ul>
 
 &footer;
 </body>
 </html>
