diff --git a/AUTHORS b/AUTHORS
index d4e7490e4..3541d3bda 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,5 +16,6 @@ Authors are (ordered by first commit date):
 - Kiall Mac Innes
 - Jon Bernard
 - Olivier Mengué
+- Emre Berge Ergenekon
 
 Portions derived from other open source works are clearly marked.
diff --git a/Changes.mdown b/Changes.mdown
index 53858b6b1..71c49450d 100644
--- a/Changes.mdown
+++ b/Changes.mdown
@@ -2,6 +2,9 @@
 -----
 Release date: **not yet**
 
+* `git flow init` now detects situations where origin already has gitflow
+  branches set up, and behaves accordingly (thanks Emre Berge Ergenekon)
+
 * `git flow feature finish` can now be called without a feature branch
   name(prefix) argument and will finish the current branch, if on any.