diff --git a/Makefile.am b/Makefile.am
index f0c2845748dff102b12b11252c4aca1a5e67cc5c..52e8cb67ab04cfdca4129c7d6608bc4ce6d78e93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec
+EXTRA_DIST = ChangeLog.pre-2.1 README.GIT UPGRADE nano.spec
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index 57196b5979df113cceff196fd900b150c7a404cb..540072239b4dccf71d287a89dcb151590ee983d6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# Generate configure & friends for SVN users.
+# Generate configure & friends for GIT users.
 
 autoreconf -f -i -s
diff --git a/doc/faq.html b/doc/faq.html
index b82aaf020c836e876f879a99e08a69e99a6db700..9575e6087f21e26b2acc3060567076227f604fdd 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -19,7 +19,7 @@
 <blockquote><p><a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
   <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
   <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
-  <a href="#2.4">2.4. By subversion (for the brave).</a></p></blockquote>
+  <a href="#2.4">2.4. By GIT (for the brave).</a></p></blockquote>
 <h2><a href="#3">3. Installation and Configuration</a></h2>
 <blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
@@ -61,7 +61,7 @@
   <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
   <a href="#7.3">7.3. How do I submit a bug report or patch?</a><br>
   <a href="#7.4">7.4. How do I join the development team?</a><br>
-  <a href="#7.5">7.5. Can I have write access to the subversion tree?</a></p></blockquote>
+  <a href="#7.5">7.5. Can I have write access to the GIT tree?</a></p></blockquote>
 <h2><a href="#8">8. ChangeLog</a></h2>
 <hr width="100%">
 <h1><a name="1"></a>1. General</h1>
@@ -111,8 +111,8 @@
   </ul>
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
 </blockquote>
-<h2><a name="2.4"></a>2.4. By subversion (for the brave).</h2>
-<blockquote><p>For the 'bleeding edge' current version of nano, you can use subversion to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://svn.savannah.gnu.org/viewvc/trunk/nano/README.SVN?root=nano&view=markup">the nano SVN document</a> for info on anonymous SVN access to the nano source.</p></blockquote>
+<h2><a name="2.4"></a>2.4. By GIT (for the brave).</h2>
+<blockquote><p>For the 'bleeding edge' current version of nano, you can use GIT to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://git.savannah.gnu.org/cgit/nano.git/tree/README.GIT">the nano GIT document</a> for info on anonymous GIT access to the nano source.</p></blockquote>
 <hr width="100%">
 <h1><a name="3"></a>3. Installation and Configuration</h1>
 <h2><a name="3.1"></a>3.1. How do I install the RPM or DEB package?</h2>
@@ -254,11 +254,12 @@ Of course, due to the license change you can now use the <A HREF="http://www.was
 <p>The best place to submit bugs is to the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a> as you can check whether the bug you are submitting has already been submitted.
 <p>Please submit patches for nano via the <a href="https://savannah.gnu.org/patch/?group=nano">Savannah project's patch manager</a> for the nano project.</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
-<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
-<h2><a name="7.5"></a>7.5. Can I have write access to the subversion tree?</h2>
+<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
+<h2><a name="7.5"></a>7.5. Can I have write access to the git tree?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
 <blockquote><p>
+2016/04/17 - Update docs to refer to GIT instead of subversion. (Mike)<br>
 2015/07/18 - More small fixes and updates. (Benno)<br>
 2014/04/24 - A bunch of small fixes and updates. (Benno)<br>
 2009/11/30 - Update various bits for nano 2.2.x. (DLR)<br>
diff --git a/po/LINGUAS b/po/LINGUAS
index 51f16128f0c7a3cf7f34096fb7da1838abe36559..1ceb6b706f7c8437696966f8a6b3ce12fd630d65 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # List of available languages.
-bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW 
+bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW
diff --git a/po/update_linguas.sh b/po/update_linguas.sh
index b97f6756fceab551db0f83cd8275339521898617..036e53b7ec0dd9157cec125c87269320230e82fe 100755
--- a/po/update_linguas.sh
+++ b/po/update_linguas.sh
@@ -1,21 +1,16 @@
 #!/bin/sh
+cd "$(dirname "$0")" || exit
 echo "Updating translations via TP" && \
 rsync -Lrtvz  translationproject.org::tp/latest/nano/ .
-#
-NEWSTUFF=`svn status | grep "^\? .*.po$" | awk '{ print $NF }'`
-if [ "x$NEWSTUFF" != "x" ]; then
-    echo "Adding new languaes to SVN"
-    svn add $NEWSTUFF
-fi
-#
+git add -v *.po
 echo "Updating LINGUAS for all translations"
 FILE=LINGUAS
-echo "# List of available languages." >$FILE
-/bin/ls *.po | tr '\n' ' ' | sed 's/\.po//g' >>$FILE
-echo >> $FILE
-#
-if [ "x$NEWSTUFF" != "x" ]; then
-    echo -n "New langs found, re-running configure and make at top level (silently)..."
+echo "# List of available languages." >"${FILE}"
+echo $(printf '%s\n' *.po | LC_ALL=C sort | sed 's/\.po//g') >>"${FILE}"
+git add -v "${FILE}"
+NEWSTUFF=$(git status --porcelain *.po)
+if [ -n "${NEWSTUFF}" ]; then
+    printf "New langs found, re-running configure and make at top level (silently)..."
     (cd .. && ./configure  && make) >/dev/null
     echo "done"
 fi