diff --git a/CHANGELOG b/CHANGELOG
index 90918f111..714afd396 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+KeePassDroid (2.1.0.0)
  * Add support for KDBXv4 (used in mainline KeePass >= 2.35)
  * Updated Lithuanian translations
  * Updated Russian translations
diff --git a/app/app.iml b/app/app.iml
index c328ae9b2..08608e4eb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -149,6 +149,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/flavor1" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
@@ -178,6 +179,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
diff --git a/app/build.gradle b/app/build.gradle
index 9ddee3c1d..334241781 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         minSdkVersion 3
         targetSdkVersion 12
 
-        versionCode = 154
-        versionName = "2.0.6.4"
+        versionCode = 155
+        versionName = "2.1.0.0"
 
         testApplicationId = "com.keepassdroid.tests"
         testInstrumentationRunner = "android.test.InstrumentationTestRunner"