diff --git a/doc/usage/first_steps.rst b/doc/usage/first_steps.rst
index 38b2b1b..1ed7ef1 100644
--- a/doc/usage/first_steps.rst
+++ b/doc/usage/first_steps.rst
@@ -1,3 +1,5 @@
+.. _first-steps:
+
 First Steps on pagure
 =====================
 
@@ -22,6 +24,8 @@ system, then you will find on the login page an option to create a new
 account.
 
 
+.. _upload-your-ssh-key:
+
 Upload your SSH key
 -------------------
 
diff --git a/doc/usage/forks.rst b/doc/usage/forks.rst
index 7d8247f..4fe51e7 100644
--- a/doc/usage/forks.rst
+++ b/doc/usage/forks.rst
@@ -54,12 +54,18 @@ It's a good idea to give the branch a descriptive name so you can find it later.
 Next, make your changes. Once you're satisfied, add the changes to Git's staging
 area and commit the changes::
 
-    $ git add -A  # Adds everything
-    $ git commit -s
+    $ git add -A  # add all changes
+    $ git commit -s # prepare changes for upload
 
 Your text editor of choice will open and you can write your commit message.
+If you have not done so already :ref:`upload-your-ssh-key` now.
 Afterwards, you are ready to push your changes to your remote fork::
 
-    $ git push -u origin my-feature-or-bugfix
+    $ git push -u origin my-feature-or-bugfix # upload changes
 
-You are now ready to :ref:`open-pull-request`
+In case you cloned the repo using `https://pagure.io/forks/jcline/pagure.git <https://pagure.io/forks/jcline/pagure.git>`_
+the push will fail. An easy temporary workaround is to use::
+
+    $ git push -u origin my-feature-or-bugfix ssh://git@pagure.io/forks/jcline/pagure.git
+
+You are now ready to :ref:`open-pull-request`.