diff --git a/Makefile.am b/Makefile.am
index 61b68fcf1..0b34a6361 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,5 +4,14 @@ SUBDIRS = src test etc
 DIST_SUBDIRS = config src test etc
 EXTRA_DIST = lxc.spec
 
+ChangeLog::
+	@echo "Generating ChangeLog"
+	@cvs2cl
+
 rpm: dist
 	rpmbuild --clean -ta ${distdir}.tar.gz
+release: rpm
+	@sh ./release.sh $(PACKAGE_NAME) \
+			$(LXC_MAJOR_VERSION) \
+			$(LXC_MINOR_VERSION) \
+			$(LXC_MICRO_VERSION)
diff --git a/configure.in b/configure.in
index d5ee8068d..9ce751ac9 100644
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,14 @@ if test "x$GCC" = "xyes"; then
   CFLAGS="$CFLAGS -Wall"
 fi
 
+LXC_MAJOR_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f1)
+LXC_MINOR_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f2)
+LXC_MICRO_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f3)
+
+AC_SUBST(LXC_MAJOR_VERSION)
+AC_SUBST(LXC_MINOR_VERSION)
+AC_SUBST(LXC_MICRO_VERSION)
+
 AC_CONFIG_FILES([
         Makefile
 	lxc.spec