diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLogcat.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLogcat.java
index 89c04bf7c5..40086d370e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLogcat.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLogcat.java
@@ -21,7 +21,7 @@ public class LogSectionLogcat implements LogSection {
       final Process        process        = Runtime.getRuntime().exec("logcat -d");
       final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
       final StringBuilder  log            = new StringBuilder();
-      final String         separator      = System.getProperty("line.separator");
+      final String         separator      = System.lineSeparator();
 
       String line;
       while ((line = bufferedReader.readLine()) != null) {
diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Hex.java b/core-util-jvm/src/main/java/org/signal/core/util/Hex.java
index b26029116f..73a9cc68c9 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/Hex.java
+++ b/core-util-jvm/src/main/java/org/signal/core/util/Hex.java
@@ -14,7 +14,7 @@ public class Hex {
   private final static int HEX_DIGITS_START = 10;
   private final static int ASCII_TEXT_START = HEX_DIGITS_START + (16*2 + (16/2));
 
-  final static String EOL = System.getProperty("line.separator");
+  final static String EOL = System.lineSeparator();
 
   private final static char[] HEX_DIGITS = {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java
index 8f0acdc7cb..12384af3df 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Hex.java
@@ -16,7 +16,7 @@ public class Hex {
   private final static int HEX_DIGITS_START = 10;
   private final static int ASCII_TEXT_START = HEX_DIGITS_START + (16*2 + (16/2));
 
-  final static String EOL = System.getProperty("line.separator");
+  final static String EOL = System.lineSeparator();
 
   private final static char[] HEX_DIGITS = {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'