diff --git a/resources/lib/backup.py b/resources/lib/backup.py
index fec25fd..b6e95f0 100644
--- a/resources/lib/backup.py
+++ b/resources/lib/backup.py
@@ -160,6 +160,15 @@ class XbmcBackup:
                 if(not shouldContinue):
                     return
 
+            # check if Kodi settings should also be dumped
+            if(utils.getSettingBool('backup_copy_settings')):
+                utils.log('Backing up Kodi settings')
+                gui_settings = GuiSettingsManager()
+                gui_settings.backup()
+
+                # add this file to the backup
+                self.remote_vfs.put(xbmcvfs.translatePath(utils.data_dir() + gui_settings.filename), self.remote_vfs.root_path + gui_settings.filename)
+
             orig_base_path = self.remote_vfs.root_path
 
             # backup all the files
diff --git a/resources/lib/guisettings.py b/resources/lib/guisettings.py
index 3af795e..4d05561 100644
--- a/resources/lib/guisettings.py
+++ b/resources/lib/guisettings.py
@@ -7,6 +7,7 @@ from xml.parsers.expat import ExpatError
 
 
 class GuiSettingsManager:
+    filename = 'kodi_settings.json'
     doc = None
 
     def __init__(self):
@@ -16,8 +17,18 @@ class GuiSettingsManager:
         # read in the copy
         self._readFile(xbmcvfs.translatePath('special://home/userdata/guisettings.xml.restored'))
 
+    def backup(self):
+        # get all of the current Kodi settings
+        json_response = json.loads(xbmc.executeJSONRPC('{"jsonrpc":"2.0", "id":1, "method":"Settings.GetSettings","params":{"level":"advanced"}}'))
+
+        # write the settings as a json object to the addon data directory
+        sFile = xbmcvfs.File(xbmcvfs.translatePath(utils.data_dir() + self.filename), 'w')
+        sFile.write(json.dumps(json_response['result']['settings']))
+        sFile.write("")
+        sFile.close()
+
     def run(self):
-        # get a list of all the settings we can manipulate via json
+        # get all of the current Kodi settings
         json_response = json.loads(xbmc.executeJSONRPC('{"jsonrpc":"2.0", "id":1, "method":"Settings.GetSettings","params":{"level":"advanced"}}'))
 
         settings = json_response['result']['settings']
diff --git a/resources/settings.xml b/resources/settings.xml
index 7e19f0c..054263b 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -21,6 +21,8 @@
 		<setting id="remove_auth_button" type="action" label="30093" action="RunScript(special://home/addons/script.xbmcbackup/launcher.py,action=remove_auth)" visible="gt(-9,1)"/>
 	</category>
 	<category id="selection" label="30012">
+		<setting id="backup_copy_settings" type="bool" label="Save Kodi Settings" default="true" />
+		<setting type="sep" />
 		<setting id="backup_selection_type" type="enum" lvalues="30014|30015" default="0" label="30023" />
 		<setting id="backup_addon_data" type="bool" label="30031" default="false" visible="eq(-1,0)"/>
 		<setting id="backup_config" type="bool" label="30035" default="true" visible="eq(-2,0)"/>