diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
index 83b586a610..7f31059135 100644
--- a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
+++ b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
@@ -1,21 +1,19 @@
 ################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#      Inspired and partly copied from:
-#  http://youresuchageek.blogspot.fr/2012/09/howto-raspberry-pi-openelec-on.html
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
 #
-#  OpenELEC is free software: you can redistribute it and/or modify
+#  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 2 of the License, or
 #  (at your option) any later version.
 #
-#  OpenELEC is distributed in the hope that it will be useful,
+#  LibreELEC is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 # Bootloader configuration - config.txt
 ################################################################################
@@ -24,74 +22,37 @@
 # Memory (System/GPU configuration )
 ################################################################################
 
-# default GPU memory split (do not change if you do not know what you are doing)
+# Default GPU memory split (do not change if you do not know what you are doing)
   gpu_mem=128
 
-# SDRAM size based GPU memory split, uncomment and setup to override 'gpu_mem'
+# Configure GPU memory based on SDRAM size - overrides above setting
   gpu_mem_256=112
   gpu_mem_512=160
   gpu_mem_1024=256
 
 ################################################################################
-# Overclocking settings
-# WARNING: Do not change/enable if you do not know what you are doing!
-#          The System may become unstable or you can have data corruption or
-#          you can loose your warranty if you set wrong settings
-#
-# please read: http://elinux.org/RPi_config.txt#Overclocking_configuration
-################################################################################
-
-# Overclock mode settings.
-#
-# default recommended values are: arm_freq | core_freq | sdram_freq | over_voltage
-# no overclocking               :    700   |    250    |    400     |      0
-# mode 'Modest'                 :    800   |    300    |    400     |      0
-# mode 'Medium'                 :    900   |    333    |    450     |      2
-# mode 'High'                   :    950   |    450    |    450     |      6
-# mode 'Turbo'                  :   1000   |    500    |    600     |      6
-# mode 'Pi2'                    :   1000   |    500    |    500     |      2
-
-# arm_freq=700
-# core_freq=250
-# sdram_freq=400
-# over_voltage=0
-
-# set to 'force_turbo=1' to disable dynamic overclocking (you can lose your warranty!)
-  force_turbo=0
-
-# If you have any data corruption using Turbo Mode and overclocking
-# try with this setting uncommented
-# If this still fails, try to use Medium mode without "over_voltage=2"
-# If it ultimately keeps failing, forget about this until it gets fixed
-# Use a more conservative mode that will works fine in any cases:
-# initial_turbo=30
-
-################################################################################
-# Overscan settings
+# For overclocking and various other settings, see:
+# https://www.raspberrypi.org/documentation/configuration/config-txt.md
 ################################################################################
+# Set 'force_turbo=1' to disable dynamic overclocking and enable overclocking always.
+force_turbo=0
 
 # Make display smaller to stop text spilling off the screen
-# see also http://www.raspberrypi.org/phpBB3/viewtopic.php?f=67&t=15700
-# overscan_scale=1
+#
+# Note that the overscan settings only affect the splash screen and not Kodi.
+#
+# If you experience overscan/underscan issues the best solution is to adjust
+# your TV settings ("full pixel", "1-1 pixel" etc.). Alternatively, there is a
+# calibration menu in the Kodi GUI.
 # disable_overscan=1
 
-# Adapt overscan values to your needs
-# overscan_left=57
-# overscan_right=59
-# overscan_top=20
-# overscan_bottom=20
-
-################################################################################
-# various settings see also: http://elinux.org/RPi_config.txt
-################################################################################
-
 # Force HDMI even if unplugged or powered off
 # hdmi_force_hotplug=1
 
 # Doesn't sent initial active source message.
 # Avoids bringing CEC (enabled TV) out of standby and channel switch when
 # rebooting.
-  hdmi_ignore_cec_init=1
+hdmi_ignore_cec_init=1
 
 ################################################################################
 # License keys to enable GPU hardware decoding for various codecs
@@ -100,18 +61,13 @@
 
 # decode_MPG2=0x00000000
 # decode_WVC1=0x00000000
-# decode_DTS=0x00000000
-# decode_DDP=0x00000000
 
 ################################################################################
 # End of default configuration
-# all values below this line were inserted from config.txt.bk (your old config)
-# and can be merged with the above values
 ################################################################################
 
 ################################################################################
 # Include distribution specific config file if it exists.
 ################################################################################
-
 [all]
 include distroconfig.txt
diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt
index e69de29bb2..7b3c713751 100644
--- a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt
+++ b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt
@@ -0,0 +1,19 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!