diff --git a/server/go/appengine/camli/appengine/main.go b/server/go/appengine/camli/appengine/main.go
index 5445f9392..eef34262b 100644
--- a/server/go/appengine/camli/appengine/main.go
+++ b/server/go/appengine/camli/appengine/main.go
@@ -20,10 +20,9 @@ import (
 	"fmt"
 	"http"
 
+	"camli/blobserver"
 	"camli/serverconfig"
-	// Storage options:
-	_ "camli/blobserver/localdisk"
-	)
+)
 
 var mux = http.NewServeMux()
 
@@ -36,6 +35,8 @@ func exitFailure(pattern string, args ...interface{}) {
 }
 
 func init() {
+	blobserver.RegisterStorageConstructor("appengine", blobserver.StorageConstructor(newFromConfig))
+
 	config, err := serverconfig.Load("./config.json")
 	if err != nil {
 		exitFailure("Could not load server config: %v", err)
diff --git a/server/go/appengine/camli/appengine/storage.go b/server/go/appengine/camli/appengine/storage.go
new file mode 100644
index 000000000..4ef57b9c5
--- /dev/null
+++ b/server/go/appengine/camli/appengine/storage.go
@@ -0,0 +1,62 @@
+/*
+Copyright 2011 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package appengine
+
+import (
+	"io"
+	"os"
+
+	"camli/blobref"
+	"camli/blobserver"
+	"camli/jsonconfig"
+)
+
+type appengineStorage struct {
+	*blobserver.SimpleBlobHubPartitionMap
+}
+
+func newFromConfig(ld blobserver.Loader, config jsonconfig.Obj) (storage blobserver.Storage, err os.Error) {
+	sto := &appengineStorage{
+		SimpleBlobHubPartitionMap: &blobserver.SimpleBlobHubPartitionMap{},
+	}
+	if err := config.Validate(); err != nil {
+		return nil, err
+	}
+	return sto, nil
+}
+
+func (sto *appengineStorage) FetchStreaming(br *blobref.BlobRef) (file io.ReadCloser, size int64, err os.Error) {
+	err = os.EOF
+	return
+}
+
+func (sto *appengineStorage) ReceiveBlob(b *blobref.BlobRef, source io.Reader) (sb blobref.SizedBlobRef, err os.Error) {
+	err = os.NewError("TODO")
+	return
+}
+
+func (sto *appengineStorage) RemoveBlobs(blobs []*blobref.BlobRef) os.Error {
+	return os.NewError("TODO")
+}
+
+func (sto *appengineStorage) StatBlobs(dest chan<- blobref.SizedBlobRef, blobs []*blobref.BlobRef, waitSeconds int) os.Error {
+	return os.NewError("TODO")
+}
+
+func (sto *appengineStorage) EnumerateBlobs(dest chan<- blobref.SizedBlobRef, after string, limit uint, waitSeconds int) os.Error {
+	return os.NewError("TODO")
+}
diff --git a/server/go/appengine/config.json b/server/go/appengine/config.json
index 458e37ad7..5aa3441ea 100644
--- a/server/go/appengine/config.json
+++ b/server/go/appengine/config.json
@@ -4,9 +4,8 @@
 
   "prefixes": {
     "/bs/": {
-       "handler": "storage-filesystem",
+       "handler": "storage-appengine",
        "handlerArgs": {
-          "path": "/tmp/dev_appserver_fail"
        }
     }
   }