diff --git a/app/hello/main.go b/app/hello/main.go
index f7ede0ea0..bfc1dee91 100644
--- a/app/hello/main.go
+++ b/app/hello/main.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // The hello application serves as an example on how to make stand-alone
 // server applications, interacting with a Camlistore server.
-package main
+package main // import "camlistore.org/app/hello"
 
 import (
 	"flag"
diff --git a/app/publisher/fileembed.go b/app/publisher/fileembed.go
index 3c8694a97..4c16ca038 100644
--- a/app/publisher/fileembed.go
+++ b/app/publisher/fileembed.go
@@ -21,7 +21,7 @@ of a camliRoot node (a permanode with a camliRoot attribute set).
 
 #fileembed pattern .+\.(js|css|html|png|svg)$
 */
-package main
+package main // import "camlistore.org/app/publisher"
 
 import (
 	"camlistore.org/pkg/fileembed"
diff --git a/cmd/camdeploy/camdeploy.go b/cmd/camdeploy/camdeploy.go
index b1636a448..7d454c630 100644
--- a/cmd/camdeploy/camdeploy.go
+++ b/cmd/camdeploy/camdeploy.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // The camdeploy program deploys Camlistore on cloud computing platforms such as Google
 // Compute Engine or Amazon EC2.
-package main
+package main // import "camlistore.org/cmd/camdeploy"
 
 import (
 	"camlistore.org/pkg/cmdmain"
diff --git a/cmd/camget/doc.go b/cmd/camget/doc.go
index 9f5166447..00213271e 100644
--- a/cmd/camget/doc.go
+++ b/cmd/camget/doc.go
@@ -36,4 +36,4 @@ Like curl, lets you set output file/directory with -o:
 Camget isn't very fleshed out. In general, using 'cammount' to just
 mount a tree is an easier way to get files back.
 */
-package main
+package main // import "camlistore.org/cmd/camget"
diff --git a/cmd/cammount/doc.go b/cmd/cammount/doc.go
index e30e7ea9e..e35d37cce 100644
--- a/cmd/cammount/doc.go
+++ b/cmd/cammount/doc.go
@@ -27,4 +27,4 @@ Usage:
 	Acceptable forms: https://you.example.com, example.com:1345 (https assumed), or
 	http://you.example.com/alt-root
 */
-package main
+package main // import "camlistore.org/cmd/cammount"
diff --git a/cmd/camput/doc.go b/cmd/camput/doc.go
index 991c0a5fb..609e78e63 100644
--- a/cmd/camput/doc.go
+++ b/cmd/camput/doc.go
@@ -71,4 +71,4 @@ Global options:
   -verbose_http=false: show HTTP request summaries
   -version=false: show version
 */
-package main
+package main // import "camlistore.org/cmd/camput"
diff --git a/cmd/camtool/doc.go b/cmd/camtool/doc.go
index c1183dcfd..c4eead9cd 100644
--- a/cmd/camtool/doc.go
+++ b/cmd/camtool/doc.go
@@ -54,4 +54,4 @@ Global options:
   -verbose=false: extra debug logging
   -version=false: show version
 */
-package main
+package main // import "camlistore.org/cmd/camtool"
diff --git a/depcheck/depcheck.go b/depcheck/depcheck.go
index d7f9a77ad..0c03fd221 100644
--- a/depcheck/depcheck.go
+++ b/depcheck/depcheck.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package depcheck does nothing except for fail to build when
 // the system's version of Go is too old.
-package depcheck
+package depcheck // import "camlistore.org/depcheck"
diff --git a/dev/devcam/doc.go b/dev/devcam/doc.go
index 5c9bcc7e9..fc2c77ae1 100644
--- a/dev/devcam/doc.go
+++ b/dev/devcam/doc.go
@@ -44,4 +44,4 @@ For mode-specific help:
   devcam <mode> -help
 
 */
-package main
+package main // import "camlistore.org/dev/devcam"
diff --git a/dev/envvardoc/envvardoc.go b/dev/envvardoc/envvardoc.go
index 1ccbaecc1..32597ad06 100644
--- a/dev/envvardoc/envvardoc.go
+++ b/dev/envvardoc/envvardoc.go
@@ -1,6 +1,6 @@
 // Program envvardoc will verify all referenced environment variables in go
 // source are properly documented.
-package main
+package main // import "camlistore.org/dev/envvardoc"
 
 import (
 	"bufio"
diff --git a/dev/update_closure_compiler.go b/dev/update_closure_compiler.go
index 847a32307..b399dbe40 100644
--- a/dev/update_closure_compiler.go
+++ b/dev/update_closure_compiler.go
@@ -17,7 +17,7 @@ limitations under the License.
 // update_closure_compiler downloads a new version
 // of the closure compiler if the one in tmp/closure-compiler
 // doesn't exist or is older than the requested version.
-package main
+package main // import "camlistore.org/dev"
 
 import (
 	"archive/zip"
diff --git a/internal/chanworker/chanworker.go b/internal/chanworker/chanworker.go
index c0da8cc5b..98fe1bae2 100644
--- a/internal/chanworker/chanworker.go
+++ b/internal/chanworker/chanworker.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chanworker
+package chanworker // import "camlistore.org/internal/chanworker"
 
 import (
 	"container/list"
diff --git a/misc/buildbot/builder/builder.go b/misc/buildbot/builder/builder.go
index 4478a7173..513db43bb 100644
--- a/misc/buildbot/builder/builder.go
+++ b/misc/buildbot/builder/builder.go
@@ -19,7 +19,7 @@ limitations under the License.
 // Go 1, GoTip, Camlistore, and runs a battery of tests for Camlistore.
 // It then sends a report to the master and terminates.
 // It can also respond to progress requests from the master.
-package main
+package main // import "camlistore.org/misc/buildbot/builder"
 
 import (
 	"bufio"
diff --git a/misc/buildbot/master/master.go b/misc/buildbot/master/master.go
index c72218985..7c8ff85e6 100644
--- a/misc/buildbot/master/master.go
+++ b/misc/buildbot/master/master.go
@@ -21,7 +21,7 @@ limitations under the License.
 // a test suite, but it can also poll a builder before completion
 // to get a progress report.
 // It also serves the web requests.
-package main
+package main // import "camlistore.org/misc/buildbot/master"
 
 import (
 	"bytes"
diff --git a/misc/docker/dock.go b/misc/docker/dock.go
index efacbe08a..a9fdfa8e0 100644
--- a/misc/docker/dock.go
+++ b/misc/docker/dock.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Command dock builds Camlistore's various Docker images.
 // It can also generate a tarball of the Camlistore server and tools.
-package main
+package main // import "camlistore.org/misc/docker"
 
 import (
 	"archive/tar"
diff --git a/misc/docker/release/build-binaries.go b/misc/docker/release/build-binaries.go
index c1153894c..756ba896f 100644
--- a/misc/docker/release/build-binaries.go
+++ b/misc/docker/release/build-binaries.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Command build-binaries builds camlistored and the Camlistore tools.
 // It should be run in a docker container.
-package main
+package main // import "camlistore.org/misc/docker/release"
 
 import (
 	"archive/tar"
diff --git a/misc/docker/server/build-camlistore-server.go b/misc/docker/server/build-camlistore-server.go
index dffa1ffe5..ea3fcfc65 100644
--- a/misc/docker/server/build-camlistore-server.go
+++ b/misc/docker/server/build-camlistore-server.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Command build-camlistore-server builds camlistored and bundles all the
 // necessary resources for a Camlistore server in docker. It should be run in a
 // docker container.
-package main
+package main // import "camlistore.org/misc/docker/server"
 
 import (
 	"archive/tar"
diff --git a/pkg/app/app.go b/pkg/app/app.go
index 59c864999..680673775 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package app provides helpers for server applications interacting
 // with Camlistore.
-package app
+package app // import "camlistore.org/pkg/app"
 
 import (
 	"errors"
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 70c7a0ee1..e46136d24 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package auth implements Camlistore authentication.
-package auth
+package auth // import "camlistore.org/pkg/auth"
 
 import (
 	"crypto/rand"
diff --git a/pkg/blob/ref.go b/pkg/blob/ref.go
index 951614981..1b10982e5 100644
--- a/pkg/blob/ref.go
+++ b/pkg/blob/ref.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package blob defines types to refer to and retrieve low-level Camlistore blobs.
-package blob
+package blob // import "camlistore.org/pkg/blob"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/archiver/archiver.go b/pkg/blobserver/archiver/archiver.go
index 32949c1da..440044ced 100644
--- a/pkg/blobserver/archiver/archiver.go
+++ b/pkg/blobserver/archiver/archiver.go
@@ -18,7 +18,7 @@ limitations under the License.
 // and stores them somewhere. While generic, it was designed to
 // incrementally create Amazon Glacier archives from many little
 // blobs, rather than creating millions of Glacier archives.
-package archiver
+package archiver // import "camlistore.org/pkg/blobserver/archiver"
 
 import (
 	"archive/zip"
diff --git a/pkg/blobserver/blobpacked/blobpacked.go b/pkg/blobserver/blobpacked/blobpacked.go
index e5dc4f5b7..de920b2ae 100755
--- a/pkg/blobserver/blobpacked/blobpacked.go
+++ b/pkg/blobserver/blobpacked/blobpacked.go
@@ -76,7 +76,7 @@ file will have a different 'wholePartIndex' number, starting at index
 0. Each will have the same 'wholeSize'.
 */
 
-package blobpacked
+package blobpacked // import "camlistore.org/pkg/blobserver/blobpacked"
 
 // TODO: BlobStreamer using the zip manifests, for recovery.
 
diff --git a/pkg/blobserver/cond/cond.go b/pkg/blobserver/cond/cond.go
index a57bb2d24..9f68910e5 100644
--- a/pkg/blobserver/cond/cond.go
+++ b/pkg/blobserver/cond/cond.go
@@ -35,7 +35,7 @@ Example usage:
 	}
   }
 */
-package cond
+package cond // import "camlistore.org/pkg/blobserver/cond"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/dir/dir.go b/pkg/blobserver/dir/dir.go
index 022b11dd4..b15b3f578 100644
--- a/pkg/blobserver/dir/dir.go
+++ b/pkg/blobserver/dir/dir.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package dir implements the blobserver Storage interface for a directory,
 // detecting whether the directory is file-per-blob (localdisk) or diskpacked.
 // If neither, it initializes diskpacked.
-package dir
+package dir // import "camlistore.org/pkg/blobserver/dir"
 
 import (
 	"camlistore.org/pkg/blobserver"
diff --git a/pkg/blobserver/diskpacked/diskpacked.go b/pkg/blobserver/diskpacked/diskpacked.go
index e8d229cc1..b3d738e24 100644
--- a/pkg/blobserver/diskpacked/diskpacked.go
+++ b/pkg/blobserver/diskpacked/diskpacked.go
@@ -30,7 +30,7 @@ Example low-level config:
      },
 
 */
-package diskpacked
+package diskpacked // import "camlistore.org/pkg/blobserver/diskpacked"
 
 import (
 	"bufio"
diff --git a/pkg/blobserver/doc.go b/pkg/blobserver/doc.go
index bc70445e7..16db38764 100644
--- a/pkg/blobserver/doc.go
+++ b/pkg/blobserver/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package blobserver defines how raw blobs are stored and accessed.
-package blobserver
+package blobserver // import "camlistore.org/pkg/blobserver"
diff --git a/pkg/blobserver/encrypt/encrypt.go b/pkg/blobserver/encrypt/encrypt.go
index 395ecd8b6..20c38ab3f 100644
--- a/pkg/blobserver/encrypt/encrypt.go
+++ b/pkg/blobserver/encrypt/encrypt.go
@@ -27,7 +27,7 @@ limitations under the License.
 // and configuration details, which are currently subject to change.
 //
 // WARNING: work in progress as of 2013-07-13.
-package encrypt
+package encrypt // import "camlistore.org/pkg/blobserver/encrypt"
 
 import (
 	"bufio"
diff --git a/pkg/blobserver/gethandler/get.go b/pkg/blobserver/gethandler/get.go
index a2d9bc7bf..42ddcaf7e 100644
--- a/pkg/blobserver/gethandler/get.go
+++ b/pkg/blobserver/gethandler/get.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package gethandler implements the HTTP handler for fetching blobs.
-package gethandler
+package gethandler // import "camlistore.org/pkg/blobserver/gethandler"
 
 import (
 	"fmt"
diff --git a/pkg/blobserver/google/cloudstorage/storage.go b/pkg/blobserver/google/cloudstorage/storage.go
index 93d6ced83..fbffcc38e 100644
--- a/pkg/blobserver/google/cloudstorage/storage.go
+++ b/pkg/blobserver/google/cloudstorage/storage.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package cloudstorage registers the "googlecloudstorage" blob storage type, storing blobs
 // on Google Cloud Storage (not Google Drive).
 // See https://cloud.google.com/products/cloud-storage
-package cloudstorage
+package cloudstorage // import "camlistore.org/pkg/blobserver/google/cloudstorage"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/google/drive/drive.go b/pkg/blobserver/google/drive/drive.go
index c0b606fc3..ba99533cb 100644
--- a/pkg/blobserver/google/drive/drive.go
+++ b/pkg/blobserver/google/drive/drive.go
@@ -32,7 +32,7 @@ Example low-level config:
       },
     },
 */
-package drive
+package drive // import "camlistore.org/pkg/blobserver/google/drive"
 
 import (
 	"camlistore.org/pkg/blobserver"
diff --git a/pkg/blobserver/google/drive/service/service.go b/pkg/blobserver/google/drive/service/service.go
index 5db8351b2..a456f11d3 100644
--- a/pkg/blobserver/google/drive/service/service.go
+++ b/pkg/blobserver/google/drive/service/service.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // DriveService translates blobserver.Storage methods
 // into Google Drive API methods.
-package service
+package service // import "camlistore.org/pkg/blobserver/google/drive/service"
 
 import (
 	"errors"
diff --git a/pkg/blobserver/handlers/doc.go b/pkg/blobserver/handlers/doc.go
index be926471d..5fb741df3 100644
--- a/pkg/blobserver/handlers/doc.go
+++ b/pkg/blobserver/handlers/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package handlers implements the HTTP interface to the Camlistore
 // blob server.
-package handlers
+package handlers // import "camlistore.org/pkg/blobserver/handlers"
diff --git a/pkg/blobserver/local/generation.go b/pkg/blobserver/local/generation.go
index 5243fc9cc..42bd107ba 100644
--- a/pkg/blobserver/local/generation.go
+++ b/pkg/blobserver/local/generation.go
@@ -18,7 +18,7 @@ limitations under the License.
 Package local implements functionality common to both the "localdisk" and
 "diskpacked" storage mechanisms.
 */
-package local
+package local // import "camlistore.org/pkg/blobserver/local"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/localdisk/localdisk.go b/pkg/blobserver/localdisk/localdisk.go
index 6c645f407..bef651dd2 100644
--- a/pkg/blobserver/localdisk/localdisk.go
+++ b/pkg/blobserver/localdisk/localdisk.go
@@ -28,7 +28,7 @@ Example low-level config:
      },
 
 */
-package localdisk
+package localdisk // import "camlistore.org/pkg/blobserver/localdisk"
 
 import (
 	"fmt"
diff --git a/pkg/blobserver/memory/mem.go b/pkg/blobserver/memory/mem.go
index 3952e3103..ed301a78b 100644
--- a/pkg/blobserver/memory/mem.go
+++ b/pkg/blobserver/memory/mem.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package memory registers the "memory" blobserver storage type, storing blobs
 // in an in-memory map.
-package memory
+package memory // import "camlistore.org/pkg/blobserver/memory"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/mongo/mongo.go b/pkg/blobserver/mongo/mongo.go
index ebdbb2d30..9752a58dd 100644
--- a/pkg/blobserver/mongo/mongo.go
+++ b/pkg/blobserver/mongo/mongo.go
@@ -34,7 +34,7 @@ collection (optional, defaults to blobs)
 user (optional)
 password (optional)
 */
-package mongo
+package mongo // import "camlistore.org/pkg/blobserver/mongo"
 
 import (
 	"camlistore.org/pkg/blobserver"
diff --git a/pkg/blobserver/namespace/ns.go b/pkg/blobserver/namespace/ns.go
index 17be42494..1adf0dc00 100644
--- a/pkg/blobserver/namespace/ns.go
+++ b/pkg/blobserver/namespace/ns.go
@@ -20,7 +20,7 @@ limitations under the License.
 // has access and visibility to a subset of the blobs which have been
 // uploaded through this namespace. The list of accessible blobs are
 // stored in the provided "inventory" sorted key/value target.
-package namespace
+package namespace // import "camlistore.org/pkg/blobserver/namespace"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/protocol/protocol.go b/pkg/blobserver/protocol/protocol.go
index f78d0a42f..5e94c699c 100644
--- a/pkg/blobserver/protocol/protocol.go
+++ b/pkg/blobserver/protocol/protocol.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package protocol contains types for Camlistore protocol types.
-package protocol
+package protocol // import "camlistore.org/pkg/blobserver/protocol"
 
 import (
 	"encoding/json"
diff --git a/pkg/blobserver/proxycache/proxycache.go b/pkg/blobserver/proxycache/proxycache.go
index 4aa5b076b..200e75173 100644
--- a/pkg/blobserver/proxycache/proxycache.go
+++ b/pkg/blobserver/proxycache/proxycache.go
@@ -31,7 +31,7 @@ Example config:
           }
       },
 */
-package proxycache
+package proxycache // import "camlistore.org/pkg/blobserver/proxycache"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/remote/remote.go b/pkg/blobserver/remote/remote.go
index 80a37946e..fceea3111 100644
--- a/pkg/blobserver/remote/remote.go
+++ b/pkg/blobserver/remote/remote.go
@@ -31,7 +31,7 @@ Example low-level config:
      },
 
 */
-package remote
+package remote // import "camlistore.org/pkg/blobserver/remote"
 
 import (
 	"io"
diff --git a/pkg/blobserver/replica/replica.go b/pkg/blobserver/replica/replica.go
index 19928d0d9..94b24f08d 100644
--- a/pkg/blobserver/replica/replica.go
+++ b/pkg/blobserver/replica/replica.go
@@ -32,7 +32,7 @@ Example config:
           }
       },
 */
-package replica
+package replica // import "camlistore.org/pkg/blobserver/replica"
 
 import (
 	"bytes"
diff --git a/pkg/blobserver/s3/s3.go b/pkg/blobserver/s3/s3.go
index 32122e613..d55af61b2 100644
--- a/pkg/blobserver/s3/s3.go
+++ b/pkg/blobserver/s3/s3.go
@@ -31,7 +31,7 @@ Example low-level config:
      },
 
 */
-package s3
+package s3 // import "camlistore.org/pkg/blobserver/s3"
 
 import (
 	"fmt"
diff --git a/pkg/blobserver/shard/shard.go b/pkg/blobserver/shard/shard.go
index 658128cd2..1e87ff5a0 100644
--- a/pkg/blobserver/shard/shard.go
+++ b/pkg/blobserver/shard/shard.go
@@ -29,7 +29,7 @@ Example low-level config:
      },
 
 */
-package shard
+package shard // import "camlistore.org/pkg/blobserver/shard"
 
 import (
 	"errors"
diff --git a/pkg/blobserver/stats/statreceiver.go b/pkg/blobserver/stats/statreceiver.go
index c8ae6e8e5..19a6bc171 100644
--- a/pkg/blobserver/stats/statreceiver.go
+++ b/pkg/blobserver/stats/statreceiver.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package stats contains an in-memory StatReceiver that only stores sizes
 // of received blobs but not their contents.
-package stats
+package stats // import "camlistore.org/pkg/blobserver/stats"
 
 import (
 	"io"
diff --git a/pkg/blobserver/storagetest/storagetest.go b/pkg/blobserver/storagetest/storagetest.go
index 331df4af8..1cd1c143a 100644
--- a/pkg/blobserver/storagetest/storagetest.go
+++ b/pkg/blobserver/storagetest/storagetest.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package storagetest tests blobserver.Storage implementations
-package storagetest
+package storagetest // import "camlistore.org/pkg/blobserver/storagetest"
 
 import (
 	"errors"
diff --git a/pkg/buildinfo/buildinfo.go b/pkg/buildinfo/buildinfo.go
index 75f1faec4..a663fe045 100644
--- a/pkg/buildinfo/buildinfo.go
+++ b/pkg/buildinfo/buildinfo.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package buildinfo provides information about the current build.
-package buildinfo
+package buildinfo // import "camlistore.org/pkg/buildinfo"
 
 import "flag"
 
diff --git a/pkg/cacher/cacher.go b/pkg/cacher/cacher.go
index 8926a4709..5ae03b215 100644
--- a/pkg/cacher/cacher.go
+++ b/pkg/cacher/cacher.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package cacher provides various blobref fetching caching mechanisms.
-package cacher
+package cacher // import "camlistore.org/pkg/cacher"
 
 import (
 	"io"
diff --git a/pkg/camerrors/errors.go b/pkg/camerrors/errors.go
index 4934d974d..c90f70d28 100644
--- a/pkg/camerrors/errors.go
+++ b/pkg/camerrors/errors.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package camerrors define specific errors that are used to
 // decide on how to deal with some failure cases.
-package camerrors
+package camerrors // import "camlistore.org/pkg/camerrors"
 
 import (
 	"errors"
diff --git a/pkg/camlegal/legal.go b/pkg/camlegal/legal.go
index 87ec7f047..8e0914ac1 100644
--- a/pkg/camlegal/legal.go
+++ b/pkg/camlegal/legal.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package camlegal registers the Camlistore License
-package camlegal
+package camlegal // import "camlistore.org/pkg/camlegal"
 
 import "go4.org/legal"
 
diff --git a/pkg/client/android/androidx.go b/pkg/client/android/androidx.go
index 2124257d6..6b60ea294 100644
--- a/pkg/client/android/androidx.go
+++ b/pkg/client/android/androidx.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package android contains code specific to running the Camlistore client
 // code as a child process on Android. This removes ugly API from the
 // client package itself.
-package android
+package android // import "camlistore.org/pkg/client/android"
 
 import (
 	"bufio"
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 12f92d9c8..0804d331c 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package client implements a Camlistore client.
-package client
+package client // import "camlistore.org/pkg/client"
 
 import (
 	"bytes"
diff --git a/pkg/cmdmain/cmdmain.go b/pkg/cmdmain/cmdmain.go
index f7426c718..ceb84cdbd 100644
--- a/pkg/cmdmain/cmdmain.go
+++ b/pkg/cmdmain/cmdmain.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package cmdmain contains the shared implementation for camget,
 // camput, camtool, and other Camlistore command-line tools.
-package cmdmain
+package cmdmain // import "camlistore.org/pkg/cmdmain"
 
 import (
 	"flag"
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index f0df695aa..02543635f 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package constants contains Camlistore constants.
 //
 // This is a leaf package, without dependencies.
-package constants
+package constants // import "camlistore.org/pkg/constants"
 
 // MaxBlobSize is the max size of a single blob in Camlistore, in bytes.
 const MaxBlobSize = 16 << 20
diff --git a/pkg/constants/google/google.go b/pkg/constants/google/google.go
index f8af58109..57be03f0a 100644
--- a/pkg/constants/google/google.go
+++ b/pkg/constants/google/google.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package google contains constants specific to Google.
-package google
+package google // import "camlistore.org/pkg/constants/google"
 
 import "golang.org/x/oauth2"
 
diff --git a/pkg/conv/conv.go b/pkg/conv/conv.go
index 0e2e161d2..2f8678417 100644
--- a/pkg/conv/conv.go
+++ b/pkg/conv/conv.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package conv contains utilities for parsing values delimited by spaces.
-package conv
+package conv // import "camlistore.org/pkg/conv"
 
 import (
 	"bytes"
diff --git a/pkg/deploy/gce/deploy.go b/pkg/deploy/gce/deploy.go
index 9a0ad88fc..8dad5a69d 100644
--- a/pkg/deploy/gce/deploy.go
+++ b/pkg/deploy/gce/deploy.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package gce provides tools to deploy Camlistore on Google Compute Engine.
-package gce
+package gce // import "camlistore.org/pkg/deploy/gce"
 
 import (
 	"bytes"
diff --git a/pkg/env/env.go b/pkg/env/env.go
index 79befcaf1..6d001f417 100644
--- a/pkg/env/env.go
+++ b/pkg/env/env.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package env detects what sort of environment Camlistore is running in.
-package env
+package env // import "camlistore.org/pkg/env"
 
 import (
 	"os"
diff --git a/pkg/fileembed/fileembed.go b/pkg/fileembed/fileembed.go
index c3e5d3249..9b7835eca 100644
--- a/pkg/fileembed/fileembed.go
+++ b/pkg/fileembed/fileembed.go
@@ -19,7 +19,7 @@ limitations under the License.
 //
 // Most of the package contains internal details used by genfileembed.
 // Normal applications will simply make a global Files variable.
-package fileembed
+package fileembed // import "camlistore.org/pkg/fileembed"
 
 import (
 	"compress/zlib"
diff --git a/pkg/fileembed/genfileembed/genfileembed.go b/pkg/fileembed/genfileembed/genfileembed.go
index a19fb3d00..1fb5d53d5 100644
--- a/pkg/fileembed/genfileembed/genfileembed.go
+++ b/pkg/fileembed/genfileembed/genfileembed.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // The genfileembed command embeds resources into Go files, to eliminate run-time
 // dependencies on files on the filesystem.
-package main
+package main // import "camlistore.org/pkg/fileembed/genfileembed"
 
 import (
 	"bytes"
diff --git a/pkg/fs/fs.go b/pkg/fs/fs.go
index 82453b887..e60284133 100644
--- a/pkg/fs/fs.go
+++ b/pkg/fs/fs.go
@@ -18,7 +18,7 @@ limitations under the License.
 
 // Package fs implements a FUSE filesystem for Camlistore and is
 // used by the cammount binary.
-package fs
+package fs // import "camlistore.org/pkg/fs"
 
 import (
 	"fmt"
diff --git a/pkg/gc/gc.go b/pkg/gc/gc.go
index 4598af57f..4fecae6fd 100644
--- a/pkg/gc/gc.go
+++ b/pkg/gc/gc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package gc defines a generic garbage collector.
-package gc
+package gc // import "camlistore.org/pkg/gc"
 
 import (
 	"errors"
diff --git a/pkg/geocode/geocode.go b/pkg/geocode/geocode.go
index a3d8c8a27..d3de68b9d 100644
--- a/pkg/geocode/geocode.go
+++ b/pkg/geocode/geocode.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package geocode handles mapping user-entered locations into lat/long polygons.
-package geocode
+package geocode // import "camlistore.org/pkg/geocode"
 
 import (
 	"encoding/json"
diff --git a/pkg/googlestorage/googlestorage.go b/pkg/googlestorage/googlestorage.go
index c4b162013..00afe3036 100644
--- a/pkg/googlestorage/googlestorage.go
+++ b/pkg/googlestorage/googlestorage.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package googlestorage is simple Google Cloud Storage client.
 //
 // It does not include any Camlistore-specific logic.
-package googlestorage
+package googlestorage // import "camlistore.org/pkg/googlestorage"
 
 import (
 	"bytes"
diff --git a/pkg/hashutil/hashutil.go b/pkg/hashutil/hashutil.go
index 568473525..d0e3d912e 100644
--- a/pkg/hashutil/hashutil.go
+++ b/pkg/hashutil/hashutil.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package hashutil contains misc hashing functions lacking homes elsewhere.
-package hashutil
+package hashutil // import "camlistore.org/pkg/hashutil"
 
 import (
 	"crypto/sha1"
diff --git a/pkg/httputil/httputil.go b/pkg/httputil/httputil.go
index 48712d897..856cad850 100644
--- a/pkg/httputil/httputil.go
+++ b/pkg/httputil/httputil.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package httputil contains a bunch of HTTP utility code, some generic,
 // and some Camlistore-specific.
-package httputil
+package httputil // import "camlistore.org/pkg/httputil"
 
 import (
 	"bytes"
diff --git a/pkg/images/fastjpeg/fastjpeg.go b/pkg/images/fastjpeg/fastjpeg.go
index 1d127cde9..aa30369bc 100644
--- a/pkg/images/fastjpeg/fastjpeg.go
+++ b/pkg/images/fastjpeg/fastjpeg.go
@@ -20,7 +20,7 @@ limitations under the License.
 // This reduces the amount of data that must be decompressed into memory when
 // the full resolution image isn't required, i.e. in the case of generating
 // thumbnails.
-package fastjpeg
+package fastjpeg // import "camlistore.org/pkg/images/fastjpeg"
 
 import (
 	"bytes"
diff --git a/pkg/images/images.go b/pkg/images/images.go
index 70f6982fd..fbef2bd7f 100644
--- a/pkg/images/images.go
+++ b/pkg/images/images.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package images
+package images // import "camlistore.org/pkg/images"
 
 import (
 	"bytes"
diff --git a/pkg/images/resize/resize.go b/pkg/images/resize/resize.go
index 4b1ef9330..45a42ddcb 100644
--- a/pkg/images/resize/resize.go
+++ b/pkg/images/resize/resize.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package resize resizes images.
-package resize
+package resize // import "camlistore.org/pkg/images/resize"
 
 import (
 	"image"
diff --git a/pkg/importer/allimporters/importers.go b/pkg/importer/allimporters/importers.go
index 5bab9dbb5..190d299a9 100644
--- a/pkg/importer/allimporters/importers.go
+++ b/pkg/importer/allimporters/importers.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package allimporters registers all the importer implementations.
-package allimporters
+package allimporters // import "camlistore.org/pkg/importer/allimporters"
 
 import (
 	_ "camlistore.org/pkg/importer/dummy"
diff --git a/pkg/importer/dummy/dummy.go b/pkg/importer/dummy/dummy.go
index d7ac2fc65..9aca4074f 100644
--- a/pkg/importer/dummy/dummy.go
+++ b/pkg/importer/dummy/dummy.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package dummy is an example importer for development purposes.
-package dummy
+package dummy // import "camlistore.org/pkg/importer/dummy"
 
 import (
 	"fmt"
diff --git a/pkg/importer/feed/atom/atom.go b/pkg/importer/feed/atom/atom.go
index 73c3ab055..499230963 100644
--- a/pkg/importer/feed/atom/atom.go
+++ b/pkg/importer/feed/atom/atom.go
@@ -5,7 +5,7 @@
 // Adapted from encoding/xml/read_test.go.
 
 // Package atom defines XML data structures for an Atom feed.
-package atom
+package atom // import "camlistore.org/pkg/importer/feed/atom"
 
 import (
 	"encoding/xml"
diff --git a/pkg/importer/feed/feed.go b/pkg/importer/feed/feed.go
index e9363f526..4491f7de8 100644
--- a/pkg/importer/feed/feed.go
+++ b/pkg/importer/feed/feed.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package feed implements an importer for RSS, Atom, and RDF feeds.
-package feed
+package feed // import "camlistore.org/pkg/importer/feed"
 
 import (
 	"bytes"
diff --git a/pkg/importer/feed/rdf/rdf.go b/pkg/importer/feed/rdf/rdf.go
index f931c4191..90d3da9f9 100644
--- a/pkg/importer/feed/rdf/rdf.go
+++ b/pkg/importer/feed/rdf/rdf.go
@@ -15,7 +15,7 @@
  */
 
 // Package rdf defines XML data structures for an RDF feed.
-package rdf
+package rdf // import "camlistore.org/pkg/importer/feed/rdf"
 
 import (
 	"encoding/xml"
diff --git a/pkg/importer/feed/rss/rss.go b/pkg/importer/feed/rss/rss.go
index 2598c042b..7db8dc316 100644
--- a/pkg/importer/feed/rss/rss.go
+++ b/pkg/importer/feed/rss/rss.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package rss defines XML data structures for an RSS feed.
-package rss
+package rss // import "camlistore.org/pkg/importer/feed/rss"
 
 type RSS struct {
 	XMLName       string  `xml:"rss"`
diff --git a/pkg/importer/flickr/flickr.go b/pkg/importer/flickr/flickr.go
index 970050136..6bf1d093f 100644
--- a/pkg/importer/flickr/flickr.go
+++ b/pkg/importer/flickr/flickr.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package flickr implements an importer for flickr.com accounts.
-package flickr
+package flickr // import "camlistore.org/pkg/importer/flickr"
 
 import (
 	"bytes"
diff --git a/pkg/importer/foursquare/foursquare.go b/pkg/importer/foursquare/foursquare.go
index bed334fc8..5ee29e6da 100644
--- a/pkg/importer/foursquare/foursquare.go
+++ b/pkg/importer/foursquare/foursquare.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package foursquare implements an importer for foursquare.com accounts.
-package foursquare
+package foursquare // import "camlistore.org/pkg/importer/foursquare"
 
 import (
 	"fmt"
diff --git a/pkg/importer/importer.go b/pkg/importer/importer.go
index d2da9d90e..62b6a6539 100644
--- a/pkg/importer/importer.go
+++ b/pkg/importer/importer.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package importer imports content from third-party websites.
-package importer
+package importer // import "camlistore.org/pkg/importer"
 
 import (
 	"errors"
diff --git a/pkg/importer/picasa/picasa.go b/pkg/importer/picasa/picasa.go
index 15b4b4e2c..60d08afac 100644
--- a/pkg/importer/picasa/picasa.go
+++ b/pkg/importer/picasa/picasa.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package picasa implements an importer for picasa.com accounts.
-package picasa
+package picasa // import "camlistore.org/pkg/importer/picasa"
 
 // TODO: removing camliPath from gallery permanode when pic deleted from gallery
 
diff --git a/pkg/importer/pinboard/pinboard.go b/pkg/importer/pinboard/pinboard.go
index cee73687c..49cd922a1 100644
--- a/pkg/importer/pinboard/pinboard.go
+++ b/pkg/importer/pinboard/pinboard.go
@@ -40,7 +40,7 @@ the future provide an api that lets us query what has changed.  We
 might want to switch to that when available to make the import process
 more light-weight.
 */
-package pinboard
+package pinboard // import "camlistore.org/pkg/importer/pinboard"
 
 import (
 	"encoding/json"
diff --git a/pkg/importer/twitter/twitter.go b/pkg/importer/twitter/twitter.go
index 48eab0a4a..6e15a9a82 100644
--- a/pkg/importer/twitter/twitter.go
+++ b/pkg/importer/twitter/twitter.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package twitter implements a twitter.com importer.
-package twitter
+package twitter // import "camlistore.org/pkg/importer/twitter"
 
 import (
 	"archive/zip"
diff --git a/pkg/index/doc.go b/pkg/index/doc.go
index bd61bcbe2..5af1ab645 100644
--- a/pkg/index/doc.go
+++ b/pkg/index/doc.go
@@ -43,4 +43,4 @@ for search operations:
    "claim|<permanode-blobref>|<keyid>|<date>|<claim-blobref>" -> "<URL:type>|<URL:attr>|<URL:value>"
 
 */
-package index
+package index // import "camlistore.org/pkg/index"
diff --git a/pkg/index/indextest/tests.go b/pkg/index/indextest/tests.go
index dd35e907b..5ac084afb 100644
--- a/pkg/index/indextest/tests.go
+++ b/pkg/index/indextest/tests.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package indextest contains the unit tests for the indexer so they
 // can be re-used for each specific implementation of the index
 // Storage interface.
-package indextest
+package indextest // import "camlistore.org/pkg/index/indextest"
 
 import (
 	"bytes"
diff --git a/pkg/index/sqlindex/sqlindex.go b/pkg/index/sqlindex/sqlindex.go
index 5d8b4b78f..cc9e09090 100644
--- a/pkg/index/sqlindex/sqlindex.go
+++ b/pkg/index/sqlindex/sqlindex.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package sqlindex implements the sorted.KeyValue interface using an *sql.DB.
-package sqlindex
+package sqlindex // import "camlistore.org/pkg/index/sqlindex"
 
 import (
 	"database/sql"
diff --git a/pkg/index/sqlite/sqlite.go b/pkg/index/sqlite/sqlite.go
index 50a625f39..d2e6a4db7 100644
--- a/pkg/index/sqlite/sqlite.go
+++ b/pkg/index/sqlite/sqlite.go
@@ -1,3 +1,3 @@
 // Empty file to make the go tool happy with a test-only directory.
 
-package sqlite
+package sqlite // import "camlistore.org/pkg/index/sqlite"
diff --git a/pkg/jsonsign/doc.go b/pkg/jsonsign/doc.go
index ff30f8570..9ae04c110 100644
--- a/pkg/jsonsign/doc.go
+++ b/pkg/jsonsign/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package jsonsign implements Camlistore's cryptographic signing and
 // verification of JSON blobs.
-package jsonsign
+package jsonsign // import "camlistore.org/pkg/jsonsign"
diff --git a/pkg/jsonsign/signhandler/sig.go b/pkg/jsonsign/signhandler/sig.go
index 000d27b45..eb6767f4a 100644
--- a/pkg/jsonsign/signhandler/sig.go
+++ b/pkg/jsonsign/signhandler/sig.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package signhandler implements the HTTP interface to signing and verifying
 // Camlistore JSON blobs.
-package signhandler
+package signhandler // import "camlistore.org/pkg/jsonsign/signhandler"
 
 import (
 	"fmt"
diff --git a/pkg/kvutil/kvutil.go b/pkg/kvutil/kvutil.go
index 6de1647a5..0d2f7942c 100644
--- a/pkg/kvutil/kvutil.go
+++ b/pkg/kvutil/kvutil.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package kvutil contains helpers related to
 // github.com/cznic/kv.
-package kvutil
+package kvutil // import "camlistore.org/pkg/kvutil"
 
 import (
 	"fmt"
diff --git a/pkg/leak/leak.go b/pkg/leak/leak.go
index 5bc2696ea..325892207 100644
--- a/pkg/leak/leak.go
+++ b/pkg/leak/leak.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package leak
+package leak // import "camlistore.org/pkg/leak"
 
 import (
 	"bytes"
diff --git a/pkg/lru/cache.go b/pkg/lru/cache.go
index 228b088ea..4a31a7b19 100644
--- a/pkg/lru/cache.go
+++ b/pkg/lru/cache.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package lru implements an LRU cache.
-package lru
+package lru // import "camlistore.org/pkg/lru"
 
 import (
 	"container/list"
diff --git a/pkg/magic/magic.go b/pkg/magic/magic.go
index 7495dba98..be0897844 100644
--- a/pkg/magic/magic.go
+++ b/pkg/magic/magic.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package magic implements MIME type sniffing of data based on the
 // well-known "magic" number prefixes in the file.
-package magic
+package magic // import "camlistore.org/pkg/magic"
 
 import (
 	"bytes"
diff --git a/pkg/media/audio.go b/pkg/media/audio.go
index 5778cbc94..e51218c91 100644
--- a/pkg/media/audio.go
+++ b/pkg/media/audio.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package media provides means for querying information about audio and video data.
-package media
+package media // import "camlistore.org/pkg/media"
 
 import (
 	"bytes"
diff --git a/pkg/misc/amazon/s3/client.go b/pkg/misc/amazon/s3/client.go
index 6396a71c3..f64bc7a18 100644
--- a/pkg/misc/amazon/s3/client.go
+++ b/pkg/misc/amazon/s3/client.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package s3 implements a generic Amazon S3 client, not specific
 // to Camlistore.
-package s3
+package s3 // import "camlistore.org/pkg/misc/amazon/s3"
 
 import (
 	"bytes"
diff --git a/pkg/misc/closure/genclosuredeps/genclosuredeps.go b/pkg/misc/closure/genclosuredeps/genclosuredeps.go
index 7d23df49a..7c1faec5b 100644
--- a/pkg/misc/closure/genclosuredeps/genclosuredeps.go
+++ b/pkg/misc/closure/genclosuredeps/genclosuredeps.go
@@ -18,7 +18,7 @@ limitations under the License.
 // outputs to os.Stdout for each .js file, which namespaces
 // it provides, and the namespaces it requires, hence helping
 // the closure library to resolve dependencies between those files.
-package main
+package main // import "camlistore.org/pkg/misc/closure/genclosuredeps"
 
 import (
 	"bytes"
diff --git a/pkg/misc/closure/gendeps.go b/pkg/misc/closure/gendeps.go
index 69178c247..9997ddc0a 100644
--- a/pkg/misc/closure/gendeps.go
+++ b/pkg/misc/closure/gendeps.go
@@ -18,7 +18,7 @@ limitations under the License.
 // closure library.
 //
 // See https://code.google.com/p/closure-library/
-package closure
+package closure // import "camlistore.org/pkg/misc/closure"
 
 import (
 	"bufio"
diff --git a/pkg/misc/closure/jstest/jstest.go b/pkg/misc/closure/jstest/jstest.go
index 3716a313c..9d13d4897 100644
--- a/pkg/misc/closure/jstest/jstest.go
+++ b/pkg/misc/closure/jstest/jstest.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package jstest uses the Go testing package to test JavaScript code using Node and Mocha.
-package jstest
+package jstest // import "camlistore.org/pkg/misc/closure/jstest"
 
 import (
 	"fmt"
diff --git a/pkg/misc/gpgagent/gpgagent.go b/pkg/misc/gpgagent/gpgagent.go
index 9c6ddfcf6..1a7787fb2 100644
--- a/pkg/misc/gpgagent/gpgagent.go
+++ b/pkg/misc/gpgagent/gpgagent.go
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 // Package gpgagent interacts with the local GPG Agent.
-package gpgagent
+package gpgagent // import "camlistore.org/pkg/misc/gpgagent"
 
 import (
 	"bufio"
diff --git a/pkg/misc/pinentry/pinentry.go b/pkg/misc/pinentry/pinentry.go
index 1e8241a4a..cc6e674b0 100644
--- a/pkg/misc/pinentry/pinentry.go
+++ b/pkg/misc/pinentry/pinentry.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package pinentry interfaces with the pinentry(1) command to securely
 // prompt the user for a password using whichever user interface the
 // user is currently using.
-package pinentry
+package pinentry // import "camlistore.org/pkg/misc/pinentry"
 
 import (
 	"bufio"
diff --git a/pkg/netutil/ident.go b/pkg/netutil/ident.go
index ba3f5786c..3866f8c1e 100644
--- a/pkg/netutil/ident.go
+++ b/pkg/netutil/ident.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package netutil identifies the system userid responsible for
 // localhost TCP connections.
-package netutil
+package netutil // import "camlistore.org/pkg/netutil"
 
 import (
 	"bufio"
diff --git a/pkg/osutil/gce/gce.go b/pkg/osutil/gce/gce.go
index 4779fbb5e..64138a73c 100644
--- a/pkg/osutil/gce/gce.go
+++ b/pkg/osutil/gce/gce.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package gce configures hooks for running Camlistore for Google Compute Engine.
-package gce
+package gce // import "camlistore.org/pkg/osutil/gce"
 
 import (
 	"errors"
diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go
index dac0c1975..bdd4afb58 100644
--- a/pkg/osutil/osutil.go
+++ b/pkg/osutil/osutil.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package osutil provides operating system-specific path information,
 // and other utility functions.
-package osutil
+package osutil // import "camlistore.org/pkg/osutil"
 
 import (
 	"errors"
diff --git a/pkg/pools/pools.go b/pkg/pools/pools.go
index 4fc2f2e91..e286ec9eb 100644
--- a/pkg/pools/pools.go
+++ b/pkg/pools/pools.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package pools
+package pools // import "camlistore.org/pkg/pools"
 
 import (
 	"bytes"
diff --git a/pkg/publish/types.go b/pkg/publish/types.go
index 8e2f43d29..8bb82b97b 100644
--- a/pkg/publish/types.go
+++ b/pkg/publish/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package publish exposes the types and functions that can be used
 // from a Go template, for publishing.
-package publish
+package publish // import "camlistore.org/pkg/publish"
 
 import (
 	"html/template"
diff --git a/pkg/readerutil/readersize.go b/pkg/readerutil/readersize.go
index 4cfc4116f..8db2686aa 100644
--- a/pkg/readerutil/readersize.go
+++ b/pkg/readerutil/readersize.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package readerutil provides and operates on io.Readers.
-package readerutil
+package readerutil // import "camlistore.org/pkg/readerutil"
 
 import (
 	"bytes"
diff --git a/pkg/rollsum/rollsum.go b/pkg/rollsum/rollsum.go
index 8f84b46e5..3f7e692cc 100644
--- a/pkg/rollsum/rollsum.go
+++ b/pkg/rollsum/rollsum.go
@@ -19,7 +19,7 @@ limitations under the License.
 //
 // The bup project is at https://github.com/apenwarr/bup and its splitting in
 // particular is at https://github.com/apenwarr/bup/blob/master/lib/bup/bupsplit.c
-package rollsum
+package rollsum // import "camlistore.org/pkg/rollsum"
 
 import ()
 
diff --git a/pkg/schema/nodeattr/nodeattr.go b/pkg/schema/nodeattr/nodeattr.go
index 7277067e1..4fd6e09f7 100644
--- a/pkg/schema/nodeattr/nodeattr.go
+++ b/pkg/schema/nodeattr/nodeattr.go
@@ -20,7 +20,7 @@ limitations under the License.
 // treats the special timezone offset -00:01 (one minute west of UTC)
 // as meaning that the local time was known, but the location or
 // timezone was not. Usually this is from EXIF files.
-package nodeattr
+package nodeattr // import "camlistore.org/pkg/schema/nodeattr"
 
 const (
 	// Type is the Camlistore permanode type ("camliNodeType").
diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go
index 037c35430..a2f4ebccc 100644
--- a/pkg/schema/schema.go
+++ b/pkg/schema/schema.go
@@ -18,7 +18,7 @@ limitations under the License.
 //
 // A schema blob is a JSON-encoded blob that describes other blobs.
 // See documentation in Camlistore's doc/schema/ directory.
-package schema
+package schema // import "camlistore.org/pkg/schema"
 
 import (
 	"bytes"
diff --git a/pkg/search/search.go b/pkg/search/search.go
index 8ba0badb3..8cd8084c6 100644
--- a/pkg/search/search.go
+++ b/pkg/search/search.go
@@ -21,7 +21,7 @@ limitations under the License.
 // times. In that context, (un)deletions (of permanodes, or attributes)
 // are not considered modifications and therefore the time at which they
 // occured does not affect the result.
-package search
+package search // import "camlistore.org/pkg/search"
 
 type QueryDescriber interface {
 	Query(*SearchQuery) (*SearchResult, error)
diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go
index 43b84b095..b02524709 100644
--- a/pkg/server/app/app.go
+++ b/pkg/server/app/app.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package app helps with configuring and starting server applications
 // from Camlistore.
-package app
+package app // import "camlistore.org/pkg/server/app"
 
 import (
 	"errors"
diff --git a/pkg/server/doc.go b/pkg/server/doc.go
index 651ee0dd5..fbd14f077 100644
--- a/pkg/server/doc.go
+++ b/pkg/server/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package server implements the server HTTP interface for the UI,
 // publishing, setup, status, sync, thubnailing, etc.
-package server
+package server // import "camlistore.org/pkg/server"
diff --git a/pkg/serverinit/serverinit.go b/pkg/serverinit/serverinit.go
index 370fe65ab..d514c8776 100644
--- a/pkg/serverinit/serverinit.go
+++ b/pkg/serverinit/serverinit.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package serverinit is responsible for mapping from a Camlistore
 // configuration file and instantiating HTTP Handlers for all the
 // necessary endpoints.
-package serverinit
+package serverinit // import "camlistore.org/pkg/serverinit"
 
 import (
 	"bytes"
diff --git a/pkg/sorted/buffer/buffer.go b/pkg/sorted/buffer/buffer.go
index 601f4a8aa..8ecb19b80 100644
--- a/pkg/sorted/buffer/buffer.go
+++ b/pkg/sorted/buffer/buffer.go
@@ -18,7 +18,7 @@ limitations under the License.
 // buffers one KeyValue implementation in front of an another. It's
 // used for cases such as reindexing where you need a KeyValue but it
 // doesn't need to be flushed and consistent until the end.
-package buffer
+package buffer // import "camlistore.org/pkg/sorted/buffer"
 
 import (
 	"fmt"
diff --git a/pkg/sorted/kv.go b/pkg/sorted/kv.go
index b04178d8a..47a5c7d6f 100644
--- a/pkg/sorted/kv.go
+++ b/pkg/sorted/kv.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package sorted provides a KeyValue interface and constructor registry.
-package sorted
+package sorted // import "camlistore.org/pkg/sorted"
 
 import (
 	"errors"
diff --git a/pkg/sorted/kvfile/kvfile.go b/pkg/sorted/kvfile/kvfile.go
index 2fde1f652..85efda82b 100644
--- a/pkg/sorted/kvfile/kvfile.go
+++ b/pkg/sorted/kvfile/kvfile.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package kvfile provides an implementation of sorted.KeyValue
 // on top of a single mutable database file on disk using
 // github.com/cznic/kv.
-package kvfile
+package kvfile // import "camlistore.org/pkg/sorted/kvfile"
 
 import (
 	"bytes"
diff --git a/pkg/sorted/kvtest/kvtest.go b/pkg/sorted/kvtest/kvtest.go
index 0d4dd1014..f9d6c1280 100644
--- a/pkg/sorted/kvtest/kvtest.go
+++ b/pkg/sorted/kvtest/kvtest.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package kvtest tests sorted.KeyValue implementations.
-package kvtest
+package kvtest // import "camlistore.org/pkg/sorted/kvtest"
 
 import (
 	"reflect"
diff --git a/pkg/sorted/leveldb/leveldb.go b/pkg/sorted/leveldb/leveldb.go
index f96d44895..dd6f49a41 100644
--- a/pkg/sorted/leveldb/leveldb.go
+++ b/pkg/sorted/leveldb/leveldb.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package leveldb provides an implementation of sorted.KeyValue
 // on top of a single mutable database file on disk using
 // github.com/syndtr/goleveldb.
-package leveldb
+package leveldb // import "camlistore.org/pkg/sorted/leveldb"
 
 import (
 	"errors"
diff --git a/pkg/sorted/mongo/mongokv.go b/pkg/sorted/mongo/mongokv.go
index 1d61e57ea..e2d788945 100644
--- a/pkg/sorted/mongo/mongokv.go
+++ b/pkg/sorted/mongo/mongokv.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package mongo provides an implementation of sorted.KeyValue
 // using MongoDB.
-package mongo
+package mongo // import "camlistore.org/pkg/sorted/mongo"
 
 import (
 	"bytes"
diff --git a/pkg/sorted/mysql/mysqlkv.go b/pkg/sorted/mysql/mysqlkv.go
index 720e6ee80..74237885f 100644
--- a/pkg/sorted/mysql/mysqlkv.go
+++ b/pkg/sorted/mysql/mysqlkv.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package mysql provides an implementation of sorted.KeyValue
 // on top of MySQL.
-package mysql
+package mysql // import "camlistore.org/pkg/sorted/mysql"
 
 import (
 	"database/sql"
diff --git a/pkg/sorted/postgres/postgreskv.go b/pkg/sorted/postgres/postgreskv.go
index 415d7d416..5afd6f592 100644
--- a/pkg/sorted/postgres/postgreskv.go
+++ b/pkg/sorted/postgres/postgreskv.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package postgres provides an implementation of sorted.KeyValue
 // on top of PostgreSQL.
-package postgres
+package postgres // import "camlistore.org/pkg/sorted/postgres"
 
 import (
 	"database/sql"
diff --git a/pkg/sorted/sqlite/sqlitekv.go b/pkg/sorted/sqlite/sqlitekv.go
index 737353534..de6acde87 100644
--- a/pkg/sorted/sqlite/sqlitekv.go
+++ b/pkg/sorted/sqlite/sqlitekv.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package sqlite provides an implementation of sorted.KeyValue
 // using an SQLite database file.
-package sqlite
+package sqlite // import "camlistore.org/pkg/sorted/sqlite"
 
 import (
 	"database/sql"
diff --git a/pkg/sorted/sqlkv/sqlkv.go b/pkg/sorted/sqlkv/sqlkv.go
index 9a11ea684..c2bf02c7c 100644
--- a/pkg/sorted/sqlkv/sqlkv.go
+++ b/pkg/sorted/sqlkv/sqlkv.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package sqlkv implements the sorted.KeyValue interface using an *sql.DB.
-package sqlkv
+package sqlkv // import "camlistore.org/pkg/sorted/sqlkv"
 
 import (
 	"database/sql"
diff --git a/pkg/test/asserts/asserts.go b/pkg/test/asserts/asserts.go
index d2546ce34..2caf7afdf 100644
--- a/pkg/test/asserts/asserts.go
+++ b/pkg/test/asserts/asserts.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package asserts provides a bad implementation of test predicate
 // helpers. This package should either go away or dramatically
 // improve.
-package asserts
+package asserts // import "camlistore.org/pkg/test/asserts"
 
 import (
 	"strings"
diff --git a/pkg/test/doc.go b/pkg/test/doc.go
index 44a721a11..dbeda50f5 100644
--- a/pkg/test/doc.go
+++ b/pkg/test/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package test provides common Camlistore test objects.
-package test
+package test // import "camlistore.org/pkg/test"
diff --git a/pkg/test/dockertest/docker.go b/pkg/test/dockertest/docker.go
index 42ea9dc7d..f521dcfde 100644
--- a/pkg/test/dockertest/docker.go
+++ b/pkg/test/dockertest/docker.go
@@ -17,7 +17,7 @@ limitations under the License.
 /*
 Package dockertest contains helper functions for setting up and tearing down docker containers to aid in testing.
 */
-package dockertest
+package dockertest // import "camlistore.org/pkg/test/dockertest"
 
 import (
 	"bytes"
diff --git a/pkg/test/integration/integration.go b/pkg/test/integration/integration.go
index a4dd88ba2..7ced28920 100644
--- a/pkg/test/integration/integration.go
+++ b/pkg/test/integration/integration.go
@@ -1,3 +1 @@
-package integration
-
-// Dummy stub file. Required as of Go tip (pre-Go 1.3)?
+package integration // import "camlistore.org/pkg/test/integration"
diff --git a/pkg/types/camtypes/camtypes.go b/pkg/types/camtypes/camtypes.go
index 438a99300..c8f8f26e9 100644
--- a/pkg/types/camtypes/camtypes.go
+++ b/pkg/types/camtypes/camtypes.go
@@ -17,4 +17,4 @@ limitations under the License.
 // Package camtypes is like the types package, but higher-level and contains
 // Camlistore-specific types.  It exists mostly to break circular dependencies
 // between index, search, and schema.
-package camtypes
+package camtypes // import "camlistore.org/pkg/types/camtypes"
diff --git a/pkg/types/clientconfig/config.go b/pkg/types/clientconfig/config.go
index dd3a8ec91..6bd1bfb20 100644
--- a/pkg/types/clientconfig/config.go
+++ b/pkg/types/clientconfig/config.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package clientconfig provides types related to the client configuration
 // file.
-package clientconfig
+package clientconfig // import "camlistore.org/pkg/types/clientconfig"
 
 import (
 	"errors"
diff --git a/pkg/types/serverconfig/config.go b/pkg/types/serverconfig/config.go
index dd9ca7599..19606c272 100644
--- a/pkg/types/serverconfig/config.go
+++ b/pkg/types/serverconfig/config.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package serverconfig provides types related to the server configuration file.
-package serverconfig
+package serverconfig // import "camlistore.org/pkg/types/serverconfig"
 
 import (
 	"encoding/json"
diff --git a/pkg/video/thumbnail/service.go b/pkg/video/thumbnail/service.go
index fda267386..c4ad4f485 100644
--- a/pkg/video/thumbnail/service.go
+++ b/pkg/video/thumbnail/service.go
@@ -26,7 +26,7 @@ The default implementation uses ffmpeg.
 
 See ServiceFromConfig for accepted configuration.
 */
-package thumbnail
+package thumbnail // import "camlistore.org/pkg/video/thumbnail"
 
 import (
 	"errors"
diff --git a/pkg/webserver/webserver.go b/pkg/webserver/webserver.go
index 90670c46f..be74f8b85 100644
--- a/pkg/webserver/webserver.go
+++ b/pkg/webserver/webserver.go
@@ -19,7 +19,7 @@ limitations under the License.
 // Among other things, it can throttle its connections, inherit its
 // listening socket from a file descriptor in the environment, and
 // log all activity.
-package webserver
+package webserver // import "camlistore.org/pkg/webserver"
 
 import (
 	"bufio"
diff --git a/server/camlistored/camlistored.go b/server/camlistored/camlistored.go
index 40062d529..e9790bb38 100644
--- a/server/camlistored/camlistored.go
+++ b/server/camlistored/camlistored.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // The camlistored binary is the Camlistore server.
-package main
+package main // import "camlistore.org/server/camlistored"
 
 import (
 	"flag"
diff --git a/server/camlistored/ui/closure/closure.go b/server/camlistored/ui/closure/closure.go
index bc327a66e..aebdfaed7 100644
--- a/server/camlistored/ui/closure/closure.go
+++ b/server/camlistored/ui/closure/closure.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package closure
+package closure // import "camlistore.org/server/camlistored/ui/closure"
 
 import (
 	"archive/zip"
diff --git a/server/camlistored/ui/fileembed.go b/server/camlistored/ui/fileembed.go
index 3a14023f7..14bf9850d 100644
--- a/server/camlistored/ui/fileembed.go
+++ b/server/camlistored/ui/fileembed.go
@@ -21,7 +21,7 @@ The below is read by genfileembed.go to determine the files to embed in the
 server binary. Crazy, but true.
 #fileembed pattern .+\.(js|css|html|png|svg)$
 */
-package ui
+package ui // import "camlistore.org/server/camlistored/ui"
 
 import (
 	"camlistore.org/pkg/fileembed"
diff --git a/server/sigserver/camsigd.go b/server/sigserver/camsigd.go
index 45bd9fd33..ccfad47b9 100644
--- a/server/sigserver/camsigd.go
+++ b/server/sigserver/camsigd.go
@@ -21,7 +21,7 @@ limitations under the License.
 // possible to configure a signing-only server with
 // serverconfig/genconfig.go.  I think we basically already can. Then
 // we can delete this.
-package main
+package main // import "camlistore.org/server/sigserver"
 
 import (
 	"flag"
diff --git a/website/camweb.go b/website/camweb.go
index e3e0587b8..15bf31bae 100644
--- a/website/camweb.go
+++ b/website/camweb.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package main // import "camlistore.org/website"
 
 import (
 	"bytes"