diff --git a/toy/toy-couchstore.xml b/toy/toy-couchstore.xml
index 5ed40ed85..ba793ca9c 100644
--- a/toy/toy-couchstore.xml
+++ b/toy/toy-couchstore.xml
@@ -1,55 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote name="couchbase"      fetch="git://github.com/couchbase/"         review="review.couchbase.org" />
-  <remote name="membase"        fetch="git://github.com/membase/"           review="review.couchbase.org" />
-  <remote name="abhinavdangeti" fetch="git://github.com/abhinavdangeti/"    review="review.couchbase.org" />
-
-  <default remote="couchbase" revision="master"/>
-
-  <project name="couchbase-cli"           revision="1d239dd7f21b32cef177c3ab58d646a3f381d8ba" />
-  <project name="couchbase-examples"      revision="5f87273ad59bd3c0473ba6bcedf863db57238313" />
-  <project name="couchbase-python-client" revision="ba49b75d4bbb02ff6dbac314ad0944d14809cdd5"  />
-  <project name="couchdb"                 revision="19551d2b13c953c6c5f832e848b9414558b005ca" />
-  <project name="couchdbx-app"            revision="e6820c5af5e9c30cc2c0ad10571470d88424881c" />
-  <project name="couchstore"              revision="elsa" />
-  <project name="ep-engine"               remote="abhinavdangeti" revision="303" />
-  <project name="geocouch"                revision="2f4508ab7c4815dc0f587c94be5f673185dd5465" />
-  <project name="healthchecker"           revision="a6d5a274ff92282bc42a4ba815c75d64553e0ad3" />
-  <project name="memcached"               revision="be691c3b78a68e441d58c249e02121df7e9f8556" />
-  <project name="moxi"                    revision="33c5c06adc4b127276ed751ced67df44e0ac950d" />
-  <project name="ns_server"               revision="0e3e6ab8d9c89662b04f690adf7ec707e3d5e2d3"/>
-  <project name="platform"                revision="2a6d25c5cd2b6b7ed0771e15fee941f527a284a9" />
-  <project name="sigar"                   revision="1f6eed3b0999fc826582087dfa12fbf40b7cce7e" />
-  <project name="testrunner"              revision="20761a815238b404cae51a9337219bee673fda7c" />
-
-  <project name="tlm"                     revision="6cf181681f6bced255dda51454f89e29ce7a997c">
+  <remote name="couchbase"     fetch="git://github.com/couchbase/"         review="review.couchbase.org" />
+  <remote name="couchbase-priv" fetch="ssh://git@github.com/couchbase/"    review="review.couchbase.org" />
+  <remote name="couchbaselabs" fetch="git://github.com/couchbaselabs/"     review="review.couchbase.org" />
+  <remote name="abhinavdangeti" fetch="git://github.com/abhinavdangeti/"   review="review.couchbase.org" />
+  <remote name="dustin"        fetch="git://github.com/dustin/"            />
+  <remote name="gorilla"       fetch="git://github.com/gorilla/"           />
+  <remote name="sbinet"        fetch="git://github.com/sbinet/"            />
+  <remote name="twinj"         fetch="git://github.com/twinj/"             />
+  <remote name="natefinch"     fetch="git://github.com/natefinch/"         />
+  <remote name="samuel"        fetch="git://github.com/samuel/"            />
+  <remote name="rcrowley"      fetch="git://github.com/rcrowley/"          />
+  <remote name="erlang"        fetch="git://github.com/erlang/"            />
+
+  <default remote="couchbase" revision="master" />
+
+  <!-- Core Couchbase Server projects -->
+  <project name="couchbase-cli"           />
+  <project name="couchbase-examples"      />
+  <project name="couchbase-python-client" revision="couchbase-181" />
+  <project name="couchdb"                 />
+  <project name="couchstore"              />
+  <project name="ep-engine" remote="abhinavdangeti" revision="curr" />
+  <project name="geocouch"                />
+  <project name="healthchecker"           />
+  <project name="memcached" revision="sherlock"/>
+  <project name="moxi"                    />
+  <project name="ns_server"               />
+  <project name="platform" revision="sherlock"/>
+  <project name="sigar"                   />
+  <project name="testrunner"              />
+  <project name="tlm">
     <copyfile src="GNUmakefile"    dest="GNUmakefile"    />
     <copyfile src="Makefile"       dest="Makefile"       />
     <copyfile src="CMakeLists.txt" dest="CMakeLists.txt" />
   </project>
 
-  <!--
-  <project name="couchbase-cli"/>
-  <project name="couchbase-examples"/>
-  <project name="couchbase-python-client" revision="couchbase-181"/>
-  <project name="couchdb"/>
-  <project name="couchdbx-app" />
-  <project name="couchstore" remote="abhinavdangeti" revision="302WIN" />
-  <project name="ep-engine" remote="abhinavdangeti" revision="MB12673" />
-  <project name="geocouch"/>
-  <project name="healthchecker"/>
-  <project name="memcached" revision="3.0" remote="membase" />
-  <project name="moxi"/>
-  <project name="ns_server" revision="rel-3.0.0++" />
-  <project name="platform"/>
-  <project name="sigar"/>
-  <project name="testrunner"/>
+  <!-- Sherlock extension projects -->
 
-  <project name="tlm">
-    <copyfile src="GNUmakefile" dest="GNUmakefile"/>
-    <copyfile src="Makefile" dest="Makefile"/>
-    <copyfile src="CMakeLists.txt" dest="CMakeLists.txt"/>
-  </project>
-  -->
+  <project name="forestdb"               remote="couchbaselabs" />
+  <project name="indexing" path="goproj/src/github.com/couchbase/indexing"/>
 
+  <project name="query"                  remote="couchbase"      path="goproj/src/github.com/couchbase/query"/>
+  <project name="goxdcr"                 remote="couchbase"      path="goproj/src/github.com/couchbase/goxdcr" />
+  <project name="gometa"                                         path="goproj/src/github.com/couchbase/gometa"/>
+
+  <!-- Go support libraries - Couchbase-supported -->
+  <project name="cbauth"                                         path="godeps/src/github.com/couchbase/cbauth"/>
+  <project name="gomemcached"                                    path="godeps/src/github.com/couchbase/gomemcached"/>
+  <project name="goprotobuf"             remote="couchbaselabs"  path="godeps/src/code.google.com/p/goprotobuf"/>
+  <project name="goprotobuf"             remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/goprotobuf"/>
+  <project name="retriever"              remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/retriever" />
+  <project name="dparval"                remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/dparval"/>
+  <project name="go-couchbase"           remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/go-couchbase" />
+  <project name="clog"                   remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/clog" />
+  <project name="go-slab"                remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/go-slab" />
+  <project name="go-zookeeper"           remote="samuel"         path="godeps/src/github.com/samuel/go-zookeeper" />
+
+  <project name="goforestdb"             remote="couchbaselabs"  path="godeps/src/github.com/couchbaselabs/goforestdb" />
+
+  <!-- Go support libraries - third-party -->
+  <project name="go-jsonpointer"         remote="dustin"         path="godeps/src/github.com/dustin/go-jsonpointer"/>
+  <project name="gojson"                 remote="dustin"         path="godeps/src/github.com/dustin/gojson" />
+  <project name="mux"                    remote="gorilla"        path="godeps/src/github.com/gorilla/mux" />
+  <project name="context"                remote="gorilla"        path="godeps/src/github.com/gorilla/context" />
+  <project name="liner"                  remote="sbinet"         path="godeps/src/github.com/sbinet/liner" />
+  <project name="uuid"                   remote="twinj"          path="godeps/src/github.com/twinj/uuid" />
+  <project name="npipe"                  remote="natefinch"      path="godeps/src/github.com/natefinch/npipe" />
+  <project name="go-metrics"             remote="rcrowley"       path="godeps/src/github.com/rcrowley/go-metrics" />
+
+  <!-- Couchbase internal build infrastructure -->
+  <project name="build"      path="cbbuild"           groups="notdefault,build">
+    <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
+    <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
+    <annotation name="EDITION" value="@EDITION@" keep="true"/>
+  </project>
+  <project name="voltron"    remote="couchbase-priv"  groups="notdefault,packaging" />
+  <project name="couchdbx-app" groups="notdefault,packaging" />
 </manifest>