diff --git a/pom.xml b/pom.xml
index c4c8fda..fd50777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,12 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>ionicons-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>jobConfigHistory</artifactId>
+      <version>1229.v3039470161a_d</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.jenkins</groupId>
       <artifactId>configuration-as-code</artifactId>
diff --git a/src/main/java/org/jvnet/hudson/plugins/thinbackup/backup/HudsonBackup.java b/src/main/java/org/jvnet/hudson/plugins/thinbackup/backup/HudsonBackup.java
index d7ac65a..8ffaf56 100644
--- a/src/main/java/org/jvnet/hudson/plugins/thinbackup/backup/HudsonBackup.java
+++ b/src/main/java/org/jvnet/hudson/plugins/thinbackup/backup/HudsonBackup.java
@@ -18,11 +18,13 @@
 
 import com.google.common.base.Throwables;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Plugin;
 import hudson.PluginWrapper;
 import hudson.model.ItemGroup;
 import hudson.model.Job;
 import hudson.model.Run;
 import hudson.model.TopLevelItem;
+import hudson.plugins.jobConfigHistory.JobConfigHistory;
 import hudson.util.RunList;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -194,7 +196,15 @@ public void backup() throws IOException {
         }
 
         if (plugin.isBackupConfigHistory()) {
-            backupRootFolder(CONFIG_HISTORY_DIR_NAME);
+            final Plugin configHistoryPlugin = Jenkins.get().getPlugin("jobConfigHistory");
+            if (configHistoryPlugin != null && configHistoryPlugin.getWrapper().isActive()) {
+                final JobConfigHistory descriptor =
+                        (JobConfigHistory) Jenkins.get().getDescriptor(JobConfigHistory.class);
+                if (descriptor != null) {
+                    final File configuredHistoryRootDir = descriptor.getConfiguredHistoryRootDir();
+                    backupConfigHistoryFolder(configuredHistoryRootDir.toString());
+                }
+            }
         }
 
         if (plugin.isBackupPluginArchives()) {
@@ -584,7 +594,7 @@ private void backupBuildArchive(final File buildSrcDir, final File buildDestDir)
 
     private void backupRootFolder(String folderName) throws IOException {
         try {
-            backupRootFolder(folderName, TrueFileFilter.INSTANCE);
+            backupRootFolder(folderName, TrueFileFilter.TRUE);
         } catch (IOException e) {
             if (plugin.isFailFast()) {
                 throw e;
@@ -595,6 +605,19 @@ private void backupRootFolder(String folderName) throws IOException {
         }
     }
 
+    private void backupConfigHistoryFolder(String folderName) throws IOException {
+        final File srcDirectory = new File(folderName);
+        if (srcDirectory.exists() && srcDirectory.isDirectory()) {
+            LOGGER.log(Level.FINE, "Backing up {0}...", folderName);
+            final File destDirectory = new File(backupDirectory.getAbsolutePath(), CONFIG_HISTORY_DIR_NAME);
+            IOFileFilter filter =
+                    FileFilterUtils.and(TrueFileFilter.TRUE, getFileAgeDiffFilter(), getExcludedFilesFilter());
+            filter = FileFilterUtils.or(filter, DirectoryFileFilter.DIRECTORY);
+            FileUtils.copyDirectory(srcDirectory, destDirectory, ExistsAndReadableFileFilter.wrapperFilter(filter));
+            LOGGER.log(Level.FINE, "DONE backing up {0}.", folderName);
+        }
+    }
+
     private void backupRootFolder(String folderName, IOFileFilter fileFilter) throws IOException {
         final File srcDirectory = new File(hudsonHome.getAbsolutePath(), folderName);
         if (srcDirectory.exists() && srcDirectory.isDirectory()) {
diff --git a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.jelly b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.jelly
index 15b228e..dd15b55 100644
--- a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.jelly
+++ b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.jelly
@@ -46,6 +46,10 @@
                         <f:checkbox name="restorePlugins"/>
                     </f:entry>
 
+                    <f:entry title="${%restore_config_history}" help="/plugin/thinBackup/help/help-restoreConfigHistory.html">
+                        <f:checkbox name="restoreConfigHistory"/>
+                    </f:entry>
+
                 </f:section>
 
                 <f:bottomButtonBar>
diff --git a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.properties b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.properties
index a5b4f84..17c3bb3 100644
--- a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.properties
+++ b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions.properties
@@ -3,3 +3,4 @@ restore_configuration = Restore Configuration
 restore_next_build_number = Restore next build number file (if found in backup)
 restore_options = Restore options
 restore_plugins = Restore plugins
+restore_config_history = Restore config-history (if found in backup)
diff --git a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions_de.properties b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions_de.properties
index ff7c126..f2685b5 100644
--- a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions_de.properties
+++ b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink/restoreOptions_de.properties
@@ -1,5 +1,6 @@
 restore_backup_from = Backup wiederherstellen von:
 restore_configuration = Restore Konfiguration
-restore_next_build_number = Nächste Build Nummer Datein wiederherstellen (falls im Backup vorhanden)
+restore_next_build_number = Nächste Build Nummer Dateien wiederherstellen (falls im Backup vorhanden)
 restore_options = Restore Optionen
 restore_plugins = Plugins wiederherstellen
+restore_config_history = Config-history wiederherstellen (falls im Backup vorhanden)
diff --git a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory.html b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory.html
index 448b4fd..0111c69 100644
--- a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory.html
+++ b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory.html
@@ -24,6 +24,6 @@
 
 <div>
   <p>
-    If this option is enabled, the directory <em>config-history</em> will also be backed up.
+    If this option is enabled, the directory which is configured within the config-history plugin will also be backed up (only if plugin is installed).
   </p>
 </div>
diff --git a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory_de.html b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory_de.html
index 452bc0f..20afc91 100644
--- a/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory_de.html
+++ b/src/main/resources/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl/help-backupConfigHistory_de.html
@@ -24,6 +24,6 @@
 
 <div>
   <p>
-    Falls diese Option aktiviert ist, wird das Verzeichnis <em>config-history</em> zum Backup hinzugefügt.
+    Falls diese Option aktiviert ist, wird das Verzeichnis, welches im config-history konfiguriert ist, zum Backup hinzugefügt (nur wenn das Plugin installiert ist).
   </p>
 </div>
diff --git a/src/main/webapp/help/help-restoreConfigHistory.html b/src/main/webapp/help/help-restoreConfigHistory.html
new file mode 100644
index 0000000..5811b82
--- /dev/null
+++ b/src/main/webapp/help/help-restoreConfigHistory.html
@@ -0,0 +1,30 @@
+<!--
+  The MIT License
+ 
+  Copyright (c) 2024 Stefan Spieker
+ 
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+ 
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+
+<div>
+  <p>
+    If this option is enabled, the config-history gets restored.<br/>
+    This will only work, if the config-history plugin is installed, otherwise it cannot read the config folder.
+  </p>
+</div>
diff --git a/src/main/webapp/help/help-restoreConfigHistory_de.html b/src/main/webapp/help/help-restoreConfigHistory_de.html
new file mode 100644
index 0000000..3c5cb87
--- /dev/null
+++ b/src/main/webapp/help/help-restoreConfigHistory_de.html
@@ -0,0 +1,30 @@
+<!--
+  The MIT License
+ 
+  Copyright (c) 2024 Stefan Spieker
+ 
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+ 
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+-->
+
+<div>
+  <p>
+    Falls diese Option aktiviert ist, wird die config-history aus dem Backup wiederhergestellt.<br/>
+    Es wird nur funktionieren, falls das config-history Plugin installiert ist, sonst kann der Konfigurationsordner nicht ausgelesen werden.
+  </p>
+</div>