diff --git a/doc/tips/flickrannex.mdwn b/doc/tips/flickrannex.mdwn
index a807fed56b..269346eab0 100644
--- a/doc/tips/flickrannex.mdwn
+++ b/doc/tips/flickrannex.mdwn
@@ -20,18 +20,20 @@ This should make a ~/flickrannex folder
 
 ## Setup
 
-Run the program once to set it up.
+Run the program once to set it up. 
 
     cd ~/flickrannex; python2 flickrannex.py
 
-## Configuring git-annex
-
-    git config annex.flickr-hook '/usr/bin/python2 ~/flickrannex/flickrannex.py'
-    git annex initremote flickr type=hook hooktype=flickr encryption=shared
-    git annex describe flickr "the flickr library"
+After the setup has finished, it will print the git-annex configure lines.
 
 ## Notes
 
+### Unencrypted mode
+The photo name on flickr is currently the GPGHMACSHA1 version.
+
+The real name of the pictures and/or videos will be in the description.
+
+### Encrypted mode
 The current version base64 encodes all the data, which results in ~35% larger filesize.
 
 I might look into yyenc instead. I'm not sure if it will work in the tEXt field.