diff --git a/Command/Export.hs b/Command/Export.hs
index 0afcc3af1a..f2bbcaf010 100644
--- a/Command/Export.hs
+++ b/Command/Export.hs
@@ -82,7 +82,8 @@ seek o = do
 		db <- openDb (uuid r)
 		ea <- exportActions r
 		changeExport r ea db new
-		void $ fillExport r ea db new
+		unlessM (Annex.getState Annex.fast) $
+			void $ fillExport r ea db new
 		closeDb db
 
 -- | Changes what's exported to the remote. Does not upload any new
diff --git a/doc/git-annex-export.mdwn b/doc/git-annex-export.mdwn
index 98fb40c570..4807a64346 100644
--- a/doc/git-annex-export.mdwn
+++ b/doc/git-annex-export.mdwn
@@ -50,6 +50,12 @@ And, git-annex will never trust an export to retain the content of a key.
   the branch. `git annex sync --content` and the git-annex assistant
   will update exports when it commits to the branch they are tracking.
 
+* `--fast`
+
+  This sets up an export of a tree, but avoids any expensive file uploads to
+  the remote. You can later run `git annex sync --content` to upload
+  the files to the export.
+
 # EXAMPLE
 
 	git annex initremote myexport type=directory directory=/mnt/myexport \