diff --git a/CHANGELOG.md b/CHANGELOG.md
index d171dc7e6ad..75197bfad9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 ### Added
 
 - We introduced a settings parameters to manage citations' relations local storage time-to-live with a default value set to 30 days. [#11189](https://github.com/JabRef/jabref/issues/11189)
+- We introduced an option in Preferences under (under Linked files -> Linked file name conventions) to automatically rename linked files when an entry data changes. [#11316](https://github.com/JabRef/jabref/issues/11316)
 
 ### Changed
 
diff --git a/jabgui/build.gradle.kts b/jabgui/build.gradle.kts
index 890ea06369f..a4f4d698282 100644
--- a/jabgui/build.gradle.kts
+++ b/jabgui/build.gradle.kts
@@ -131,6 +131,10 @@ dependencies {
     testImplementation("io.github.classgraph:classgraph:4.8.179")
     testImplementation("org.testfx:testfx-core:4.0.16-alpha")
     testImplementation("org.testfx:testfx-junit5:4.0.16-alpha")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.12.2")
+    testImplementation("org.junit.platform:junit-platform-launcher:1.12.2")
 
     testImplementation("org.mockito:mockito-core:5.18.0") {
         exclude(group = "net.bytebuddy", module = "byte-buddy")
diff --git a/jabgui/src/main/java/org/jabref/gui/LibraryTab.java b/jabgui/src/main/java/org/jabref/gui/LibraryTab.java
index 2afe8e908c1..a924b054fe0 100644
--- a/jabgui/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/LibraryTab.java
@@ -43,6 +43,7 @@
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.gui.externalfiles.AutoRenameFileOnEntryChange;
 import org.jabref.gui.externalfiles.ImportHandler;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
@@ -203,6 +204,7 @@ private void initializeComponentsAndListeners(boolean isDummyContext) {
 
         bibDatabaseContext.getDatabase().registerListener(this);
         bibDatabaseContext.getMetaData().registerListener(this);
+        new AutoRenameFileOnEntryChange(bibDatabaseContext, preferences);
 
         this.selectedGroupsProperty = new SimpleListProperty<>(stateManager.getSelectedGroups(bibDatabaseContext));
         this.tableModel = new MainTableDataModel(getBibDatabaseContext(), preferences, taskExecutor, getIndexManager(), selectedGroupsProperty(), searchQueryProperty, resultSizeProperty());
diff --git a/jabgui/src/main/java/org/jabref/gui/externalfiles/AutoRenameFileOnEntryChange.java b/jabgui/src/main/java/org/jabref/gui/externalfiles/AutoRenameFileOnEntryChange.java
new file mode 100644
index 00000000000..c4db6722cd2
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/externalfiles/AutoRenameFileOnEntryChange.java
@@ -0,0 +1,66 @@
+package org.jabref.gui.externalfiles;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.logic.FilePreferences;
+import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
+import org.jabref.logic.cleanup.RenamePdfCleanup;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.event.FieldChangedEvent;
+
+import com.google.common.eventbus.Subscribe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.jabref.logic.citationkeypattern.BracketedPattern.expandBrackets;
+
+public class AutoRenameFileOnEntryChange {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutoRenameFileOnEntryChange.class);
+
+    private final GuiPreferences preferences;
+    private final BibDatabaseContext bibDatabaseContext;
+    private final RenamePdfCleanup renamePdfCleanup;
+
+    public AutoRenameFileOnEntryChange(BibDatabaseContext bibDatabaseContext, GuiPreferences preferences) {
+        this.bibDatabaseContext = bibDatabaseContext;
+        this.preferences = preferences;
+        bibDatabaseContext.getDatabase().registerListener(this);
+        renamePdfCleanup = new RenamePdfCleanup(false, () -> bibDatabaseContext, preferences.getFilePreferences());
+    }
+
+    @Subscribe
+    public void listen(FieldChangedEvent event) {
+        FilePreferences filePreferences = preferences.getFilePreferences();
+
+        if (!filePreferences.shouldAutoRenameFilesOnChange()
+                || filePreferences.getFileNamePattern().isEmpty()
+                || filePreferences.getFileNamePattern() == null
+                || !relatesToFilePattern(filePreferences.getFileNamePattern(), event)) {
+            return;
+        }
+
+        BibEntry entry = event.getBibEntry();
+        if (entry.getFiles().isEmpty()) {
+            return;
+        }
+        new CitationKeyGenerator(bibDatabaseContext, preferences.getCitationKeyPatternPreferences()).generateAndSetKey(entry);
+        renamePdfCleanup.cleanup(entry);
+
+        LOGGER.info("Field changed for entry {}: {}", entry.getCitationKey().orElse("defaultCitationKey"), event.getField().getName());
+    }
+
+    private boolean relatesToFilePattern(String fileNamePattern, FieldChangedEvent event) {
+        Set<String> extractedFields = new HashSet<>();
+
+        expandBrackets(fileNamePattern, bracketContent -> {
+            extractedFields.add(bracketContent);
+            return bracketContent;
+        });
+
+        return extractedFields.contains("bibtexkey")
+                || extractedFields.contains(event.getField().getName());
+    }
+}
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java b/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
index f67aba3c420..f4683d4a202 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
@@ -36,6 +36,7 @@ public class LinkedFilesTab extends AbstractPreferenceTabView<LinkedFilesTabView
     @FXML private TextField autolinkRegexKey;
 
     @FXML private CheckBox fulltextIndex;
+    @FXML private CheckBox autoRenameFilesOnChange;
 
     @FXML private ComboBox<String> fileNamePattern;
     @FXML private TextField fileDirectoryPattern;
@@ -73,6 +74,7 @@ public void initialize() {
         autolinkRegexKey.textProperty().bindBidirectional(viewModel.autolinkRegexKeyProperty());
         autolinkRegexKey.disableProperty().bind(autolinkUseRegex.selectedProperty().not());
         fulltextIndex.selectedProperty().bindBidirectional(viewModel.fulltextIndexProperty());
+        autoRenameFilesOnChange.selectedProperty().bindBidirectional(viewModel.autoRenameFilesOnChangeProperty());
         fileNamePattern.valueProperty().bindBidirectional(viewModel.fileNamePatternProperty());
         fileNamePattern.itemsProperty().bind(viewModel.defaultFileNamePatternsProperty());
         fileDirectoryPattern.textProperty().bindBidirectional(viewModel.fileDirectoryPatternProperty());
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java b/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
index 3b83c2c7f0b..313274508f6 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -37,6 +37,7 @@ public class LinkedFilesTabViewModel implements PreferenceTabViewModel {
     private final ListProperty<String> defaultFileNamePatternsProperty =
             new SimpleListProperty<>(FXCollections.observableArrayList(FilePreferences.DEFAULT_FILENAME_PATTERNS));
     private final BooleanProperty fulltextIndex = new SimpleBooleanProperty();
+    private final BooleanProperty autoRenameFilesOnChangeProperty = new SimpleBooleanProperty();
     private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
     private final StringProperty fileDirectoryPatternProperty = new SimpleStringProperty();
     private final BooleanProperty confirmLinkedFileDeleteProperty = new SimpleBooleanProperty();
@@ -82,6 +83,7 @@ public void setValues() {
         useMainFileDirectoryProperty.setValue(!filePreferences.shouldStoreFilesRelativeToBibFile());
         useBibLocationAsPrimaryProperty.setValue(filePreferences.shouldStoreFilesRelativeToBibFile());
         fulltextIndex.setValue(filePreferences.shouldFulltextIndexLinkedFiles());
+        autoRenameFilesOnChangeProperty.setValue(filePreferences.shouldAutoRenameFilesOnChange());
         fileNamePatternProperty.setValue(filePreferences.getFileNamePattern());
         fileDirectoryPatternProperty.setValue(filePreferences.getFileDirectoryPattern());
         confirmLinkedFileDeleteProperty.setValue(filePreferences.confirmDeleteLinkedFile());
@@ -104,6 +106,7 @@ public void storeSettings() {
         // External files preferences / Attached files preferences / File preferences
         filePreferences.setMainFileDirectory(mainFileDirectoryProperty.getValue());
         filePreferences.setStoreFilesRelativeToBibFile(useBibLocationAsPrimaryProperty.getValue());
+        filePreferences.setAutoRenameFilesOnChange(autoRenameFilesOnChangeProperty.getValue());
         filePreferences.setFileNamePattern(fileNamePatternProperty.getValue());
         filePreferences.setFileDirectoryPattern(fileDirectoryPatternProperty.getValue());
         filePreferences.setFulltextIndexLinkedFiles(fulltextIndex.getValue());
@@ -179,6 +182,10 @@ public ListProperty<String> defaultFileNamePatternsProperty() {
         return defaultFileNamePatternsProperty;
     }
 
+    public BooleanProperty autoRenameFilesOnChangeProperty() {
+        return autoRenameFilesOnChangeProperty;
+    }
+
     public StringProperty fileNamePatternProperty() {
         return fileNamePatternProperty;
     }
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
index f71481fbe9b..947d1bdb7ae 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
@@ -65,6 +65,7 @@
     <CheckBox fx:id="fulltextIndex" text="%Automatically index all linked files for fulltext search"/>
 
     <Label styleClass="sectionHeader" text="%Linked file name conventions"/>
+    <CheckBox fx:id="autoRenameFilesOnChange" text="%Auto rename files if entry changes"/>
     <GridPane hgap="4.0" vgap="4.0">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
diff --git a/jabgui/src/test/java/org/jabref/gui/externalfiles/AutoRenameFileOnEntryChangeTest.java b/jabgui/src/test/java/org/jabref/gui/externalfiles/AutoRenameFileOnEntryChangeTest.java
new file mode 100644
index 00000000000..d0e4c53bcef
--- /dev/null
+++ b/jabgui/src/test/java/org/jabref/gui/externalfiles/AutoRenameFileOnEntryChangeTest.java
@@ -0,0 +1,150 @@
+package org.jabref.gui.externalfiles;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.logic.FilePreferences;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
+import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.metadata.MetaData;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class AutoRenameFileOnEntryChangeTest {
+    private FilePreferences filePreferences;
+    private BibEntry entry;
+    private Path tempDir;
+
+    @BeforeEach
+    void setUp(@TempDir Path tempDir) {
+        this.tempDir = tempDir;
+        MetaData metaData = new MetaData();
+        metaData.setLibrarySpecificFileDirectory(tempDir.toString());
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(), metaData);
+        GlobalCitationKeyPatterns keyPattern = GlobalCitationKeyPatterns.fromPattern("[auth][year]");
+        GuiPreferences guiPreferences = mock(GuiPreferences.class);
+        filePreferences = mock(FilePreferences.class);
+        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
+                false,
+                true,
+                false,
+                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                keyPattern,
+                "",
+                ',');
+
+        when(guiPreferences.getCitationKeyPatternPreferences()).thenReturn(patternPreferences);
+        when(guiPreferences.getFilePreferences()).thenReturn(filePreferences);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
+        when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey]");
+
+        entry = new BibEntry(StandardEntryType.Article).withCitationKey("oldKey2081")
+                .withField(StandardField.AUTHOR, "oldKey")
+                .withField(StandardField.YEAR, "2081");
+
+        bibDatabaseContext.getDatabase().insertEntry(entry);
+        new AutoRenameFileOnEntryChange(bibDatabaseContext, guiPreferences);
+    }
+
+    @Test
+    void noFileRenameByDefault() throws IOException {
+        Files.createFile(tempDir.resolve("oldKey2081.pdf"));
+        entry.setFiles(List.of(new LinkedFile("", "oldKey2081.pdf", "PDF")));
+        entry.setField(StandardField.AUTHOR, "newKey");
+
+        assertEquals("oldKey2081.pdf", entry.getFiles().getFirst().getLink());
+        assertTrue(Files.exists(tempDir.resolve("oldKey2081.pdf")));
+    }
+
+    @Test
+    void noFileRenameOnEmptyFilePattern() throws IOException {
+        Files.createFile(tempDir.resolve("oldKey2081.pdf"));
+        entry.setFiles(List.of(new LinkedFile("", "oldKey2081.pdf", "PDF")));
+        when(filePreferences.getFileNamePattern()).thenReturn("");
+        when(filePreferences.shouldAutoRenameFilesOnChange()).thenReturn(true);
+        entry.setField(StandardField.AUTHOR, "newKey");
+
+        assertEquals("oldKey2081.pdf", entry.getFiles().getFirst().getLink());
+        assertTrue(Files.exists(tempDir.resolve("oldKey2081.pdf")));
+    }
+
+    @Test
+    void singleFileRenameOnEntryChange() throws IOException {
+        Files.createFile(tempDir.resolve("oldKey2081.pdf"));
+        entry.setFiles(List.of(new LinkedFile("", "oldKey2081.pdf", "PDF")));
+        when(filePreferences.shouldAutoRenameFilesOnChange()).thenReturn(true);
+
+        // change author only
+        entry.setField(StandardField.AUTHOR, "newKey");
+        assertEquals("newKey2081.pdf", entry.getFiles().getFirst().getLink());
+        assertTrue(Files.exists(tempDir.resolve("newKey2081.pdf")));
+
+        // change year only
+        entry.setField(StandardField.YEAR, "2082");
+        assertEquals("newKey2082.pdf", entry.getFiles().getFirst().getLink());
+        assertTrue(Files.exists(tempDir.resolve("newKey2082.pdf")));
+    }
+
+    @Test
+    void multipleFilesRenameOnEntryChange() throws IOException {
+        // create multiple entries
+        List<String> fileNames = Arrays.asList(
+                "oldKey2081.pdf",
+                "oldKey2081.jpg",
+                "oldKey2081.csv",
+                "oldKey2081.doc",
+                "oldKey2081.docx"
+        );
+
+        for (String fileName : fileNames) {
+            Path filePath = tempDir.resolve(fileName);
+            Files.createFile(filePath);
+        }
+
+        LinkedFile pdfLinkedFile = new LinkedFile("", "oldKey2081.pdf", "PDF");
+        LinkedFile jpgLinkedFile = new LinkedFile("", "oldKey2081.jpg", "JPG");
+        LinkedFile csvLinkedFile = new LinkedFile("", "oldKey2081.csv", "CSV");
+        LinkedFile docLinkedFile = new LinkedFile("", "oldKey2081.doc", "DOC");
+        LinkedFile docxLinkedFile = new LinkedFile("", "oldKey2081.docx", "DOCX");
+
+        entry.setFiles(List.of(pdfLinkedFile, jpgLinkedFile, csvLinkedFile, docLinkedFile, docxLinkedFile));
+        when(filePreferences.shouldAutoRenameFilesOnChange()).thenReturn(true);
+
+        // Change author only
+        entry.setField(StandardField.AUTHOR, "newKey");
+        assertTrue(Files.exists(tempDir.resolve("newKey2081.pdf")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2081.jpg")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2081.csv")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2081.doc")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2081.docx")));
+
+        // change year only
+        entry.setField(StandardField.YEAR, "2082");
+        assertTrue(Files.exists(tempDir.resolve("newKey2082.pdf")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2082.jpg")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2082.csv")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2082.doc")));
+        assertTrue(Files.exists(tempDir.resolve("newKey2082.docx")));
+    }
+}
diff --git a/jablib/src/main/java/org/jabref/logic/FilePreferences.java b/jablib/src/main/java/org/jabref/logic/FilePreferences.java
index b2de37fcd32..4ff1e5fdb3e 100644
--- a/jablib/src/main/java/org/jabref/logic/FilePreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/FilePreferences.java
@@ -22,6 +22,7 @@ public class FilePreferences {
     private final StringProperty userAndHost = new SimpleStringProperty();
     private final SimpleStringProperty mainFileDirectory = new SimpleStringProperty();
     private final BooleanProperty storeFilesRelativeToBibFile = new SimpleBooleanProperty();
+    private final BooleanProperty autoRenameFilesOnChange = new SimpleBooleanProperty();
     private final StringProperty fileNamePattern = new SimpleStringProperty();
     private final StringProperty fileDirectoryPattern = new SimpleStringProperty();
     private final BooleanProperty downloadLinkedFiles = new SimpleBooleanProperty();
@@ -39,6 +40,7 @@ public class FilePreferences {
     public FilePreferences(String userAndHost,
                            String mainFileDirectory,
                            boolean storeFilesRelativeToBibFile,
+                           boolean autoRenameFilesOnChange,
                            String fileNamePattern,
                            String fileDirectoryPattern,
                            boolean downloadLinkedFiles,
@@ -55,6 +57,7 @@ public FilePreferences(String userAndHost,
         this.userAndHost.setValue(userAndHost);
         this.mainFileDirectory.setValue(mainFileDirectory);
         this.storeFilesRelativeToBibFile.setValue(storeFilesRelativeToBibFile);
+        this.autoRenameFilesOnChange.setValue(autoRenameFilesOnChange);
         this.fileNamePattern.setValue(fileNamePattern);
         this.fileDirectoryPattern.setValue(fileDirectoryPattern);
         this.downloadLinkedFiles.setValue(downloadLinkedFiles);
@@ -106,6 +109,18 @@ public void setStoreFilesRelativeToBibFile(boolean shouldStoreFilesRelativeToBib
         this.storeFilesRelativeToBibFile.set(shouldStoreFilesRelativeToBibFile);
     }
 
+    public boolean shouldAutoRenameFilesOnChange() {
+        return autoRenameFilesOnChange.get();
+    }
+
+    public BooleanProperty autoRenameFilesOnChangeProperty() {
+        return autoRenameFilesOnChange;
+    }
+
+    public void setAutoRenameFilesOnChange(boolean autoRenameFilesOnChange) {
+        this.autoRenameFilesOnChange.set(autoRenameFilesOnChange);
+    }
+
     public String getFileNamePattern() {
         return fileNamePattern.get();
     }
diff --git a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index bd35b70f208..ad1baf5936a 100644
--- a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -252,6 +252,7 @@ public class JabRefCliPreferences implements CliPreferences {
     public static final String CLEANUP_JOBS = "CleanUpJobs";
     public static final String CLEANUP_FIELD_FORMATTERS_ENABLED = "CleanUpFormattersEnabled";
     public static final String CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
+    public static final String AUTO_RENAME_FILES_ON_CHANGE = "autoRenameFilesOnChange";
     public static final String IMPORT_FILENAMEPATTERN = "importFileNamePattern";
     public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
     public static final String NAME_FORMATTER_VALUE = "nameFormatterFormats";
@@ -640,6 +641,7 @@ protected JabRefCliPreferences() {
         defaults.put(CLEANUP_FIELD_FORMATTERS_ENABLED, Boolean.FALSE);
         defaults.put(CLEANUP_FIELD_FORMATTERS, FieldFormatterCleanups.getMetaDataString(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, OS.NEWLINE));
 
+        defaults.put(AUTO_RENAME_FILES_ON_CHANGE, false);
         // use citation key appended with filename as default pattern
         defaults.put(IMPORT_FILENAMEPATTERN, FilePreferences.DEFAULT_FILENAME_PATTERNS[1]);
         // Default empty String to be backwards compatible
@@ -1530,6 +1532,7 @@ public FilePreferences getFilePreferences() {
                 getInternalPreferences().getUserAndHost(),
                 getPath(MAIN_FILE_DIRECTORY, getDefaultPath()).toString(),
                 getBoolean(STORE_RELATIVE_TO_BIB),
+                getBoolean(AUTO_RENAME_FILES_ON_CHANGE),
                 get(IMPORT_FILENAMEPATTERN),
                 get(IMPORT_FILEDIRPATTERN),
                 getBoolean(DOWNLOAD_LINKED_FILES),
@@ -1549,6 +1552,7 @@ public FilePreferences getFilePreferences() {
         EasyBind.listen(getInternalPreferences().getUserAndHostProperty(), (_, _, newValue) -> filePreferences.getUserAndHostProperty().setValue(newValue));
         EasyBind.listen(filePreferences.mainFileDirectoryProperty(), (_, _, newValue) -> put(MAIN_FILE_DIRECTORY, newValue));
         EasyBind.listen(filePreferences.storeFilesRelativeToBibFileProperty(), (_, _, newValue) -> putBoolean(STORE_RELATIVE_TO_BIB, newValue));
+        EasyBind.listen(filePreferences.autoRenameFilesOnChangeProperty(), (_, _, newValue) -> putBoolean(AUTO_RENAME_FILES_ON_CHANGE, newValue));
         EasyBind.listen(filePreferences.fileNamePatternProperty(), (_, _, newValue) -> put(IMPORT_FILENAMEPATTERN, newValue));
         EasyBind.listen(filePreferences.fileDirectoryPatternProperty(), (_, _, newValue) -> put(IMPORT_FILEDIRPATTERN, newValue));
         EasyBind.listen(filePreferences.downloadLinkedFilesProperty(), (_, _, newValue) -> putBoolean(DOWNLOAD_LINKED_FILES, newValue));
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 433be54d054..2b9c53d1408 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -1102,6 +1102,7 @@ Please\ specify\ a\ terminal\ application.=Please specify a terminal application
 Use\ custom\ file\ browser=Use custom file browser
 Use\ custom\ terminal\ emulator=Use custom terminal emulator
 Linked\ file\ name\ conventions=Linked file name conventions
+Auto\ rename\ files\ if\ entry\ changes=Auto rename files if entry changes
 Filename\ format\ pattern=Filename format pattern
 Filename\ format\ pattern\ (from\ preferences)=Filename format pattern (from preferences)
 Additional\ parameters=Additional parameters