diff --git a/ChangeLog b/ChangeLog
index c0c33af..0d08aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 2014-01-25  Kim Holviala  <kim@holviala.com>
 
+	* Don't update ChangeLog unless the source tree is a git repo
+	* Make ChangeLog update itself automatically from git log
 	* Up Debian package version to 1.5
 	* Added .gitignore
 	* Clean up supported platforms list
diff --git a/Makefile b/Makefile
index b54404f..7a8efd5 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 NAME    = gophernicus
 PACKAGE = $(NAME)
 BINARY  = in.$(NAME)
-VERSION = 1.5-rc1
+VERSION = 1.5
 
 SOURCES = $(NAME).c file.c menu.c string.c platform.c session.c options.c
 HEADERS = functions.h files.h
@@ -33,7 +33,7 @@ NET_SRV = /boot/common/settings/network/services
 
 DIST    = $(PACKAGE)-$(VERSION)
 TGZ     = $(DIST).tar.gz
-RELDIR  = /var/gopher/gophernicus.org/software/gophernicus/server/
+RELDIR  = /var/gopher/gophernicus.org/software/gophernicus/
 
 CC      = gcc
 HOSTCC	= $(CC)
diff --git a/git2changelog b/git2changelog
new file mode 100755
index 0000000..d8df6ce
--- /dev/null
+++ b/git2changelog
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+##
+## Generate ChangeLog from git log
+##
+
+PREVIOUS=
+IFS=/
+
+echo "[ Automatically generated from git log ]"
+
+git log --pretty=tformat:"%ad  %an  <%ae>/%s" --date=short | \
+while read AUTHOR COMMENT; do
+	[ "$AUTHOR" != "$PREVIOUS" ] && printf "\n$AUTHOR\n\n"
+	printf "\t* $COMMENT\n"
+	PREVIOUS="$AUTHOR"
+done
+
+echo
+echo