diff --git a/TASKS.txt b/TASKS.txt
index 0d27c21f..75c20365 100644
--- a/TASKS.txt
+++ b/TASKS.txt
@@ -14,6 +14,8 @@ following challenges you'd like to solve.
 Tasks
 -----
 
+:doc:`gsoc2011`
+
 Adapt existing code for use
 ```````````````````````````
 These snippets and packages have already been written.  Some need to be
diff --git a/doc/source/api/scikits.image.color.txt b/doc/source/api/scikits.image.color.txt
index ee2bbe8f..cad07a5d 100644
--- a/doc/source/api/scikits.image.color.txt
+++ b/doc/source/api/scikits.image.color.txt
@@ -9,6 +9,8 @@ Module: :mod:`color`
 
    scikits.image.color.convert_colorspace
    scikits.image.color.hsv2rgb
+   scikits.image.color.rgb2gray
+   scikits.image.color.rgb2grey
    scikits.image.color.rgb2hsv
    scikits.image.color.rgb2rgbcie
    scikits.image.color.rgb2xyz
@@ -25,6 +27,16 @@ hsv2rgb
 
 .. autofunction:: scikits.image.color.hsv2rgb
 
+rgb2gray
+--------
+
+.. autofunction:: scikits.image.color.rgb2gray
+
+rgb2grey
+--------
+
+.. autofunction:: scikits.image.color.rgb2grey
+
 rgb2hsv
 -------
 
diff --git a/doc/source/api/scikits.image.filter.txt b/doc/source/api/scikits.image.filter.txt
index 380ec6be..0f1064bd 100644
--- a/doc/source/api/scikits.image.filter.txt
+++ b/doc/source/api/scikits.image.filter.txt
@@ -25,6 +25,7 @@ Inheritance diagram for ``scikits.image.filter``:
 .. autosummary::
 
    scikits.image.filter.inverse
+   scikits.image.filter.median_filter
    scikits.image.filter.wiener
 
 inverse
@@ -32,6 +33,11 @@ inverse
 
 .. autofunction:: scikits.image.filter.inverse
 
+median_filter
+-------------
+
+.. autofunction:: scikits.image.filter.median_filter
+
 wiener
 ------
 
diff --git a/doc/source/api/scikits.image.io.txt b/doc/source/api/scikits.image.io.txt
index 5e06b734..ec8ad675 100644
--- a/doc/source/api/scikits.image.io.txt
+++ b/doc/source/api/scikits.image.io.txt
@@ -37,6 +37,7 @@ Inheritance diagram for ``scikits.image.io``:
 .. autosummary::
 
    scikits.image.io.imread
+   scikits.image.io.imread_collection
    scikits.image.io.imsave
    scikits.image.io.imshow
    scikits.image.io.load_sift
@@ -53,6 +54,11 @@ imread
 
 .. autofunction:: scikits.image.io.imread
 
+imread_collection
+-----------------
+
+.. autofunction:: scikits.image.io.imread_collection
+
 imsave
 ------
 
diff --git a/doc/source/api/scikits.image.opencv.txt b/doc/source/api/scikits.image.opencv.txt
index 8a2e8164..6946677c 100644
--- a/doc/source/api/scikits.image.opencv.txt
+++ b/doc/source/api/scikits.image.opencv.txt
@@ -37,12 +37,16 @@ Inheritance diagram for ``scikits.image.opencv``:
    scikits.image.opencv.cvFilter2D
    scikits.image.opencv.cvFindChessboardCorners
    scikits.image.opencv.cvFindCornerSubPix
+   scikits.image.opencv.cvFindExtrinsicCameraParams2
+   scikits.image.opencv.cvFindFundamentalMat
+   scikits.image.opencv.cvFloodFill
    scikits.image.opencv.cvGetQuadrangleSubPix
    scikits.image.opencv.cvGetRectSubPix
    scikits.image.opencv.cvGoodFeaturesToTrack
    scikits.image.opencv.cvIntegral
    scikits.image.opencv.cvLaplace
    scikits.image.opencv.cvLogPolar
+   scikits.image.opencv.cvMatchTemplate
    scikits.image.opencv.cvMorphologyEx
    scikits.image.opencv.cvPreCornerDetect
    scikits.image.opencv.cvPyrDown
@@ -54,6 +58,7 @@ Inheritance diagram for ``scikits.image.opencv``:
    scikits.image.opencv.cvUndistort2
    scikits.image.opencv.cvWarpAffine
    scikits.image.opencv.cvWarpPerspective
+   scikits.image.opencv.cvWatershed
 
 cvAdaptiveThreshold
 -------------------
@@ -120,6 +125,21 @@ cvFindCornerSubPix
 
 .. autofunction:: scikits.image.opencv.cvFindCornerSubPix
 
+cvFindExtrinsicCameraParams2
+----------------------------
+
+.. autofunction:: scikits.image.opencv.cvFindExtrinsicCameraParams2
+
+cvFindFundamentalMat
+--------------------
+
+.. autofunction:: scikits.image.opencv.cvFindFundamentalMat
+
+cvFloodFill
+-----------
+
+.. autofunction:: scikits.image.opencv.cvFloodFill
+
 cvGetQuadrangleSubPix
 ---------------------
 
@@ -150,6 +170,11 @@ cvLogPolar
 
 .. autofunction:: scikits.image.opencv.cvLogPolar
 
+cvMatchTemplate
+---------------
+
+.. autofunction:: scikits.image.opencv.cvMatchTemplate
+
 cvMorphologyEx
 --------------
 
@@ -205,3 +230,8 @@ cvWarpPerspective
 
 .. autofunction:: scikits.image.opencv.cvWarpPerspective
 
+cvWatershed
+-----------
+
+.. autofunction:: scikits.image.opencv.cvWatershed
+
diff --git a/doc/source/gsoc2011.txt b/doc/source/gsoc2011.txt
new file mode 100644
index 00000000..a2186c72
--- /dev/null
+++ b/doc/source/gsoc2011.txt
@@ -0,0 +1,14 @@
+Project ideas for Google Summer of Code 2011
+============================================
+
+- Vastly increase the number of algorithms covered by the SciKit, by
+  implementing several prominent algorithms (probabilistic hough, radon
+  transform, etc.) from papers.  Also incorporate code from the Broad
+  Institute's CellProfiler team.
+
+- Implement a new backend infrastructure so that the same results may be
+  obtained using either NumPy, OpenCL, Theano, etc.
+
+- Implement optimised core routines, such as fast 2D convolution.  This should
+  be as fast as CvFilter2D (which is faster than ndimage, for example).
+