diff --git a/packages/addons/tools/btrfs-progs/changelog.txt b/packages/addons/tools/btrfs-progs/changelog.txt
new file mode 100644
index 0000000000..ed5784c55b
--- /dev/null
+++ b/packages/addons/tools/btrfs-progs/changelog.txt
@@ -0,0 +1,2 @@
+100
+- Initial Release
diff --git a/packages/addons/tools/btrfs-progs/icon/icon.png b/packages/addons/tools/btrfs-progs/icon/icon.png
new file mode 100644
index 0000000000..8fc1aee0db
Binary files /dev/null and b/packages/addons/tools/btrfs-progs/icon/icon.png differ
diff --git a/packages/addons/tools/btrfs-progs/package.mk b/packages/addons/tools/btrfs-progs/package.mk
new file mode 100644
index 0000000000..f64a6fde88
--- /dev/null
+++ b/packages/addons/tools/btrfs-progs/package.mk
@@ -0,0 +1,51 @@
+################################################################################
+#      This file is part of LibreELEC - https://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/>.
+################################################################################
+
+PKG_NAME="btrfs-progs"
+PKG_VERSION="4.8.4"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page"
+PKG_URL="https://github.com/kdave/btrfs-progs/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain util-linux zlib lzo"
+PKG_SECTION="tools"
+PKG_SHORTDESC="tools for the btrfs filesystem"
+PKG_LONGDESC="tools for the btrfs filesystem"
+PKG_AUTORECONF="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="BTRFS Tools"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-backtrace \
+                           --disable-documentation \
+                           --disable-convert"
+
+pre_configure_target() {
+  ./autogen.sh
+}
+
+makeinstall_target() {
+  :
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_build_dir btrfs-progs)/{btrfs,btrfsck,btrfstune,btrfs-zero-log,fsck.btrfs,mkfs.btrfs} $ADDON_BUILD/$PKG_ADDON_ID/bin
+}
diff --git a/packages/addons/tools/btrfs-progs/source/default.py b/packages/addons/tools/btrfs-progs/source/default.py
new file mode 100644
index 0000000000..880a196075
--- /dev/null
+++ b/packages/addons/tools/btrfs-progs/source/default.py
@@ -0,0 +1,22 @@
+################################################################################
+#      This file is part of LibreELEC - https://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/>.
+################################################################################
+
+import xbmcgui
+
+dialog = xbmcgui.Dialog()
+dialog.ok('', 'This is a console-only addon')