diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5aa9a36ec..4296e2780 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Changelog
 
-## Unreleased
+## v2.0.1 (2021-07-21)
 
 Changes:
 
 - Several minor translation and UI fixes
+- Fix crash in import/sharing loyalty card on Android 6
 
 ## v2.0 (2021-07-14)
 
diff --git a/app/build.gradle b/app/build.gradle
index 805883a7b..3bda0ae38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 70
-        versionName "2.0"
+        versionCode 71
+        versionName "2.0.1"
 
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/java/protect/card_locker/ImportExportTask.java b/app/src/main/java/protect/card_locker/ImportExportTask.java
index f76163cbf..8701286a8 100644
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -12,6 +12,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
@@ -76,7 +77,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
 
         try
         {
-            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
+            OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
             result = MultiFormatExporter.exportData(context, db, stream, format);
             writer.close();
         }
diff --git a/app/src/main/java/protect/card_locker/ImportURIHelper.java b/app/src/main/java/protect/card_locker/ImportURIHelper.java
index 31f4e8af9..befacf30f 100644
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -83,7 +83,7 @@ public class ImportURIHelper {
             if (fragment != null) {
                 for (String fragmentPart : fragment.split("&")) {
                     String[] fragmentData = fragmentPart.split("=", 2);
-                    kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.toString()));
+                    kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.name()));
                 }
             }
 
@@ -134,7 +134,7 @@ public class ImportURIHelper {
         }
 
         // Double-encode the value to make sure it can't accidentally contain symbols that'll break the parser
-        fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.toString()));
+        fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.name()));
 
         return fragment;
     }
diff --git a/app/src/main/java/protect/card_locker/ZipUtils.java b/app/src/main/java/protect/card_locker/ZipUtils.java
index 50f4e5bab..2472f7d44 100644
--- a/app/src/main/java/protect/card_locker/ZipUtils.java
+++ b/app/src/main/java/protect/card_locker/ZipUtils.java
@@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets;
 public class ZipUtils {
     static public String read(ZipInputStream zipInputStream) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
-        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, Charset.forName(StandardCharsets.UTF_8.name())));
+        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
         int c;
         while ((c = reader.read()) != -1) {
             stringBuilder.append((char) c);