diff --git a/Documentation/error-change-upload-blocked.txt b/Documentation/error-change-upload-blocked.txt
new file mode 100644
index 0000000000..6bad02ef5a
--- /dev/null
+++ b/Documentation/error-change-upload-blocked.txt
@@ -0,0 +1,41 @@
+One or more refs/for/ names blocks change upload
+================================================
+
+With this error message Gerrit rejects to push a commit for code
+review if the remote git repository has a branch under the
+'refs/for/' namespace.
+
+Gerrit uses the 'refs/for/' namespace for magical refs that represent
+the review queues for branches in the git repository hosted by
+Gerrit. If, for a project, a real branch is created under the
+'refs/for' namespace this conflicts with the namespace reserved for
+the Gerrit review queues and Gerrit can't accept further pushes for
+code review.
+
+To solve this problem all real branches that exist under the
+'refs/for/' namespace have to be deleted or renamed in the remote git
+repository.
+
+To see which branches exist under the 'refs/for/' namespace a Gerrit
+administrator can run the following command:
+
+----
+  $ git for-each-ref refs/for
+----
+
+If all these branches should be deleted it can be done with the
+following command:
+
+----
+  $ for n in $(git for-each-ref --format='%(refname)' refs/for);
+    do git update-ref -d $n; done
+----
+
+Branches under the 'refs/for/' namespace can be created by users that
+bypass Gerrit and push directly to the git repository itself (not
+using the Gerrit server's SSH port).
+
+
+GERRIT
+------
+Part of link:error-messages.html[Gerrit Error Messages]
diff --git a/Documentation/error-messages.txt b/Documentation/error-messages.txt
index 2f0a8f2c95..6091af3b2b 100644
--- a/Documentation/error-messages.txt
+++ b/Documentation/error-messages.txt
@@ -17,6 +17,7 @@ Error Messages
 * link:error-no-new-changes.html[no new changes]
 * link:error-not-a-gerrit-project.html[not a Gerrit project]
 * link:error-not-valid-ref.html[not valid ref]
+* link:error-change-upload-blocked.html[One or more refs/for/ names blocks change upload]
 * link:error-permission-denied.html[Permission denied (publickey)]
 * link:error-prohibited-by-gerrit.html[prohibited by Gerrit]
 * link:error-squash-commits-first.html[squash commits first]