diff --git a/HACKING b/HACKING
index efdc2099..a1035887 100644
--- a/HACKING
+++ b/HACKING
@@ -117,3 +117,10 @@ Additionally, maybe there should be some benchmark information here --
 something to let a developer know what's "too" slow...? Or general
 guidelines about optimization?
 
+== Source Code Management ==
+
+TODO: Document the existence of remote branches and discuss when and how
+      to push to them. At least provide an index so that devs know where
+      to look if an old branch needs to be maintained or a feature needs
+      to be added to a new branch. Keep in mind that git is not the most
+      intuitive SCM.
diff --git a/vimperator/TODO b/vimperator/TODO
index 555c717d..4300919c 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -97,6 +97,7 @@ FEATURES:
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
   have a look into the split browser extension
 1 Add information to liberator/HACKING file about testing and optimization
+1 Document remote branches in liberator/HACKING
 1 Reformat liberator/HACKING so that git diff can find sections and report changes @ somewhere
 - many other ideas are listed in the wiki