diff --git a/contrib/extract_translations/prepare-translation.sh b/contrib/extract_translations/prepare-translation.sh
index 0ecb61139..7a40fee78 100755
--- a/contrib/extract_translations/prepare-translation.sh
+++ b/contrib/extract_translations/prepare-translation.sh
@@ -97,7 +97,7 @@ extract_lang_all ()
 	done
 
 	cd $MSGS_DIR
-	REVISION=`svn info | grep "^Rev" | head -1 | awk '{print $2}'`
+	REVISION=`git describe --always`
 	zip $HOME/ejabberd-langs-$REVISION.zip *.translate;
 
 	rm *.translate
diff --git a/src/Makefile.in b/src/Makefile.in
index 9929890bd..6a29db152 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -291,16 +291,6 @@ Makefile: Makefile.in
 dialyzer: $(BEAMS)
 	@dialyzer -c .
 
-LASTSVNREVCHANGELOG = 2075
-changelog:
-	svn up -r $(LASTSVNREVCHANGELOG) ../ChangeLog
-	mv ../ChangeLog ../ChangeLog.old
-	svn2cl -r BASE:$(LASTSVNREVCHANGELOG) -o ../ChangeLog --group-by-day \
-	    --separate-daylogs --break-before-msg --reparagraph ..
-	cat ../ChangeLog.old >> ../ChangeLog
-	rm ../ChangeLog.old
-
-
 ## Devdoc definitions
 SRCDIR=.
 DDTDIR=.
diff --git a/src/configure b/src/configure
index 8ee359507..6437482fb 100755
--- a/src/configure
+++ b/src/configure
@@ -5958,9 +5958,9 @@ fi
 
 echo
 echo "********************** WARNING ! ************************"
-echo "*  ejabberd trunk svn is NOT ready for real usage yet,  *"
+echo "*  ejabberd master is NOT ready for real usage yet,     *"
 echo "*  because it is still in heavy development.            *"
-echo "*  Don't use ejabberd trunk yet, it is prealpha!        *"
-echo "*  Please use ejabberd 2.1.x branch.                    *"
+echo "*  Don't use ejabberd master yet, it is prealpha!       *"
+echo "*  Please use ejabberd 2.1.x branch instead.            *"
 echo "*********************************************************"
 echo
diff --git a/src/configure.ac b/src/configure.ac
index 7bc0f5f16..1a66ab13e 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -163,9 +163,9 @@ AC_OUTPUT
 
 echo
 echo "********************** WARNING ! ************************"
-echo "*  ejabberd trunk svn is NOT ready for real usage yet,  *"
+echo "*  ejabberd master is NOT ready for real usage yet,     *"
 echo "*  because it is still in heavy development.            *"
-echo "*  Don't use ejabberd trunk yet, it is prealpha!        *"
-echo "*  Please use ejabberd 2.1.x branch.                    *"
+echo "*  Don't use ejabberd master yet, it is prealpha!       *"
+echo "*  Please use ejabberd 2.1.x branch instead.            *"
 echo "*********************************************************"
 echo