diff --git a/.gitignore b/.gitignore
index 4e88d8a..1fa4a58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,8 @@ ChangeLog
 #
 build-stamp
 debian/files
+debian/changelog
 debian/gophernicus.debhelper.log
 debian/gophernicus.postrm.debhelper
 debian/gophernicus.substvars
 debian/gophernicus/
-
diff --git a/Makefile b/Makefile
index 587c99e..f5221bd 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,10 @@
 NAME     = gophernicus
 PACKAGE  = $(NAME)
 BINARY   = in.$(NAME)
-VERSION  = 2.5
-CODENAME = Millennium Edition
+VERSION  = `./version`
+CODENAME = Outta Prison
+AUTHOR   = Kim Holviala
+EMAIL    = kimholviala@fastmail.com
 
 SOURCES = $(NAME).c file.c menu.c string.c platform.c session.c options.c
 HEADERS = functions.h files.h
@@ -37,10 +39,6 @@ HAS_STD = /run/systemd/system
 SYSCONF = /etc/sysconfig
 DEFAULT = /etc/default
 
-DIST    = $(PACKAGE)-$(VERSION)
-TGZ     = $(DIST).tar.gz
-RELDIR  = $(ROOT)/gophernicus.org/software/gophernicus/
-
 CC      = gcc
 HOSTCC	= $(CC)
 CFLAGS  = -O2 -Wall
@@ -69,6 +67,8 @@ withwrap:
 # Special targets
 #
 deb:
+	printf "$(PACKAGE) ($(VERSION)) unstable; urgency=low\n\n  * Automatically generated changelog\n\n" > debian/changelog
+	printf " -- $(AUTHOR) <$(EMAIL)>  %s\n" "`LC_ALL=POSIX date "+%a, %d %b %Y %H:%M:%S %z"`" >> debian/changelog
 	dpkg-buildpackage -rfakeroot -uc -us
 
 ChangeLog:
@@ -294,19 +294,6 @@ uninstall-systemd:
 	fi
 	@echo
 
-#
-# Release targets
-#
-dist: clean functions.h ChangeLog
-	mkdir -p /tmp/$(DIST)
-	tar -cf - ./ --exclude=./.git | (cd /tmp/$(DIST) && tar -xf -)
-	(cd /tmp/ && tar -cvf - $(DIST)) | gzip > $(TGZ)
-	rm -rf /tmp/$(DIST)
-
-release: dist
-	cp $(TGZ) $(RELDIR)
-	cp README README.Gophermap INSTALL LICENSE ChangeLog $(RELDIR)
-
 
 #
 # List all C defines
@@ -321,4 +308,3 @@ defines: functions.h files.h
 loc:
 	@wc -l *.c
 
-
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index c2fd17c..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,97 +0,0 @@
-gophernicus (2.5) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Sat, 24 Jun 2017 18:55:08 +0200
-
-gophernicus (2.4) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Sat, 04 Feb 2017 10:51:28 +0200
-
-gophernicus (2.3) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Fri, 03 Feb 2017 22:54:11 +0200
-
-gophernicus (2.2) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Sun, 11 Dec 2016 11:02:34 +0200
-
-gophernicus (2.1) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Sun, 13 Nov 2016 11:11:11 +0200
-
-gophernicus (1.8.1) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Fri, 16 Oct 2015 13:18:01 +0200
-
-gophernicus (1.8) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Wed, 23 Sep 2015 19:03:28 +0200
-
-gophernicus (1.7) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Mon, 02 Mar 2015 08:52:00 +0200
-
-gophernicus (1.6) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Mon, 10 Nov 2014 11:27:06 +0200
-
-gophernicus (1.5) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Sat, 25 Jan 2014 12:41:20 +0200
-
-gophernicus (1.4) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Sun, 02 Dec 2012 09:54:55 +0200
-
-gophernicus (1.3) unstable; urgency=low
-
-  * New upstream release
-  * Fixed one off-by-one
-
- -- Kim Holviala <kim@holviala.com>  Tue, 12 Jun 2012 13:07:46 +0300
-
-gophernicus (1.2) unstable; urgency=low
-
-  * New upstream release
-
- -- Kim Holviala <kim@holviala.com>  Fri, 04 May 2012 22:05:01 +0300
-
-gophernicus (1.1) unstable; urgency=low
-
-  * New upstream release
-  * Security update, so upgrading is recommended
-
- -- Kim Holviala <kim@holviala.com>  Sat, 16 Oct 2010 08:54:13 +0300
-
-gophernicus (1.0) unstable; urgency=low
-
-  * Initial debianized release
-  * File logging by default, installs logrotate config
-  * Pre-configures php support but only suggests php5-cli
-  * Create a default gopher root
-  * Installs an @reboot cron entry to snoop system type
-    using a dmidecode script (which must be run as root)
-
- -- Kim Holviala <kim@holviala.com>  Mon, 27 Sep 2010 08:11:12 +0300
-
diff --git a/version b/version
new file mode 100755
index 0000000..3b6f405
--- /dev/null
+++ b/version
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+##
+## Generate Gophernicus version/build number
+##
+
+MAJOR=2
+MINOR=99
+
+if which git >/dev/null && test -d .git; then
+	printf "${MAJOR}."
+	git log | grep -c "^commit"
+else
+	echo ${MAJOR}.${MINOR}
+fi
+