diff --git a/release.sh b/release.sh
index cc59d6a2..14f443f3 100755
--- a/release.sh
+++ b/release.sh
@@ -55,13 +55,18 @@ git checkout -b release-${RELEASE_VERSION}
cp "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" "RELEASE-NOTES-${RELEASE_VERSION}"
git add RELEASE-NOTES-${RELEASE_VERSION}
git rm RELEASE-NOTES-${PREVIOUS_VERSION}
+sed -i "s,RELEASE-NOTES-${PREVIOUS_VERSION},RELEASE-NOTES-${RELEASE_VERSION},g" Makefile.am
+sed -i "s/AC_INIT(\[i3\], \[${PREVIOUS_VERSION}\]/AC_INIT([i3], [${RELEASE_VERSION}]/" configure.ac
sed -i "s,[^<]*,${RELEASE_VERSION},g" man/asciidoc.conf
echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION
git add I3_VERSION
git commit -a -m "release i3 ${RELEASE_VERSION}"
git tag "${RELEASE_VERSION}" -m "release i3 ${RELEASE_VERSION}" --sign --local-user=0x4AC8EE1D
-make dist
+autoreconf -fi
+mkdir build
+(cd build && ../configure && make dist-bzip2 -j8)
+cp build/i3-${RELEASE_VERSION}.tar.bz2 .
echo "Differences in the release tarball file lists:"
@@ -157,7 +162,7 @@ git add downloads/RELEASE-NOTES-${RELEASE_VERSION}.txt
sed -i "s,
Documentation for i3 v[^<]*
,Documentation for i3 v${RELEASE_VERSION}
,g" docs/index.html
sed -i "s,[^<]*,${RELEASE_VERSION},g" index.html
sed -i "s,The current stable version is .*$,The current stable version is ${RELEASE_VERSION}.,g" downloads/index.html
-sed -i "s,,\n \n ${RELEASE_VERSION} | \n i3-${RELEASE_VERSION}.tar.bz2 | \n $(ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g') | \n signature | \n $(date +'%Y-%m-%d') | \n release notes | \n
\n,g" downloads/index.html
+sed -i "s,,\n \n ${RELEASE_VERSION} | \n i3-${RELEASE_VERSION}.tar.bz2 | \n $(LC_ALL=en_US.UTF-8 ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g' | sed 's/M$/ MiB/g') | \n signature | \n $(date +'%Y-%m-%d') | \n release notes | \n
\n,g" downloads/index.html
git commit -a -m "add ${RELEASE_VERSION} release"