diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 082d1db0fa..d8e6220c19 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,7 @@
 See https://github.com/MarcusWolschon/osmeditor4android/ for documentation on this version and all changes.
 
+12.1.6: Avoid the potential for a loop attempting to join a Node to itself, updated imagery and translations.
+
 12.1.5: Exempt rhino from Proguard, updated translations and imagery.
 
 12.1.4: Small performance improvements, updated translations.
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index d7cc64b532..776e3e24e6 100755
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="de.blau.android"
     android:installLocation="auto"
-    android:versionCode="1005"
+    android:versionCode="1006"
     android:versionName="@string/app_version" >
 
     <uses-sdk
diff --git a/src/main/res/values/appname.xml b/src/main/res/values/appname.xml
index 08a56ac1e7..8790eaad77 100644
--- a/src/main/res/values/appname.xml
+++ b/src/main/res/values/appname.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string translatable="false" name="app_name">Vespucci</string>
-    <string translatable="false" name="app_version">12.1.5.0</string>
-    <string translatable="false" name="app_name_version">Vespucci 12.1.5</string>
+    <string translatable="false" name="app_version">12.1.6.0</string>
+    <string translatable="false" name="app_name_version">Vespucci 12.1.6</string>
 </resources>