diff --git a/bin/git-changelog b/bin/git-changelog
index 5ce5880..c7c390c 100755
--- a/bin/git-changelog
+++ b/bin/git-changelog
@@ -6,7 +6,8 @@ DATE=`date +'%Y-%m-%d'`
 HEAD="\nn.n.n / $DATE \n==================\n"
 
 if test "$1" = "--list"; then
-  version=`git tag | tail -n 1`
+  version=`git for-each-ref refs/tags --sort=-authordate --format='%(refname)' \
+    --count=1 | sed 's/^refs\/tags\///'`
   if test -z "$version"; then
     git log --pretty="format:  * %s"
   else
@@ -20,4 +21,4 @@ else
   if [ -f $CHANGELOG ]; then cat $CHANGELOG >> $tmp; fi
   mv $tmp $CHANGELOG
   test -n "$EDITOR" && $EDITOR $CHANGELOG
-fi
\ No newline at end of file
+fi