diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 5459e1ddb4..9ecd232b38 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -387,6 +387,15 @@ def revert_japanese_encodings(document):
         document.header[i] = "\\inputencoding %s" % jap_enc_dict[val]
 
 
+def convert_justification(document):
+    " Add the \\justification buffer param"
+    i = find_token(document.header, "\\use_indices" , 0)
+    if i == -1:
+        document.warning("Malformed LyX document: Missing \\use_indices.")
+        return
+    document.header.insert(i + 1, "\\justification true")
+
+
 def revert_justification(document):
     " Revert the \\justification buffer param"
     if not del_token(document.header, '\\justification', 0):
@@ -4432,7 +4441,7 @@ convert = [
            [415, [convert_undertilde]],
            [416, []],
            [417, [convert_japanese_encodings]],
-           [418, []],
+           [418, [convert_justification]],
            [419, []],
            [420, [convert_biblio_style]],
            [421, [convert_longtable_captions]],
diff --git a/status.21x b/status.21x
index c32b380317..fa59799dfc 100644
--- a/status.21x
+++ b/status.21x
@@ -64,6 +64,9 @@ What's new
 
 - Fix conversion of beamer block titles ending with non-ERT insets to 2.1 format.
 
+- Add \justification parameter when converting to 2.1 format (avoids when
+  converting back to 2.0 format).
+
 
 * USER INTERFACE