diff --git a/Makefile.in b/Makefile.in
index 4c5e6c54..6d49f8d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,6 +141,8 @@ src/version.cpp: Makefile version.sh $(shell if [ x`cat .version_extra 2> /dev/n
 	@mkdir -p .depend src
 	$(E) Building source file version.cpp...
 	$(Q)WRITE_OUTPUT=yes $(srcdir)/version.sh "$(GIT)" > .version_extra 2> /dev/null
+
+CLEAN += src/version.cpp
 endif
 
 install: znc $(LIBZNC)
diff --git a/make-tarball.sh b/make-tarball.sh
index 53c5ead0..d2d85549 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -38,6 +38,10 @@ git checkout-index --all --prefix=$TMPDIR/$ZNC/
     make -C modules -f modpython/Makefile.gen srcdir=. SWIG=/usr/bin/swig
     rm -fr modules/.depend
 	rm make-tarball.sh
+	sed -e "s/THIS_IS_NOT_NIGHTLY//" -i Makefile.in
+	echo '#include <znc/version.h>' > src/version.cpp
+	echo "const char* ZNC_VERSION_EXTRA = \"-rc1\";" >> src/version.cpp
+	# "rc1" part is to be fixed later
 )
 (
 	cd $TMPDIR