diff --git a/packages/addons/addon-depends/moonlight-common-c/package.mk b/packages/addons/addon-depends/moonlight-common-c/package.mk
deleted file mode 100644
index 18b94906e6..0000000000
--- a/packages/addons/addon-depends/moonlight-common-c/package.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016-present 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="moonlight-common-c"
-PKG_VERSION="c4692a5"
-PKG_SHA256="9add55e53436d9f78c1dd88c5a4e3932d30922609e3f6ac6a007a635aa82f209"
-PKG_ARCH="any"
-PKG_LICENSE="GPLv3"
-PKG_SITE="https://github.com/moonlight-stream/moonlight-common-c"
-PKG_URL="https://github.com/moonlight-stream/moonlight-common-c/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION=""
-PKG_SHORTDESC="Shared C code for the implementation of Nvidia's GameStream protocol"
-PKG_LONGDESC="Shared C code for the implementation of Nvidia's GameStream protocol"
-PKG_TOOLCHAIN="manual"
diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk
deleted file mode 100644
index e3507e1420..0000000000
--- a/packages/addons/addon-depends/moonlight-embedded/package.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016-present 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="moonlight-embedded"
-PKG_VERSION="dcda1a5"
-PKG_SHA256="b0fead77d77a6ffa73488ead2564ecba43d5c6ac397d5a751ef687f5fb42f29d"
-PKG_ARCH="any"
-PKG_LICENSE="GPLv3"
-PKG_SITE="https://github.com/irtimmer/moonlight-embedded"
-PKG_URL="https://github.com/irtimmer/moonlight-embedded/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain curl libcec pulseaudio ffmpeg systemd alsa-lib moonlight-common-c libevdev enet opus"
-PKG_SECTION=""
-PKG_SHORTDESC="Gamestream client for embedded systems"
-PKG_LONGDESC="Moonlight Embedded is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for Linux"
-
-FREESCALE_V4L_INCLUDE=""
-if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
-elif [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libamcodec"
-elif [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb"
-fi
-
-PKG_CMAKE_OPTS_TARGET="$FREESCALE_V4L_INCLUDE"
-
-pre_build_target() {
-  cp -a $(get_build_dir moonlight-common-c)/* $PKG_BUILD/third_party/moonlight-common-c
-}
-
-makeinstall_target() {
-  :
-}
diff --git a/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0001-link-against-libm.patch b/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0001-link-against-libm.patch
deleted file mode 100644
index acc2f8013a..0000000000
--- a/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0001-link-against-libm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2016-04-03 05:34:15.000000000 -0700
-+++ b/CMakeLists.txt	2016-05-04 14:33:19.840052271 -0700
-@@ -139,7 +139,7 @@
- 
- set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS})
- target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
--target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS})
-+target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} m)
- 
- add_subdirectory(docs)
- 
diff --git a/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0002-require-pthread.patch b/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0002-require-pthread.patch
deleted file mode 100644
index 8a8e03115e..0000000000
--- a/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0002-require-pthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2016-11-19 09:59:59.335970047 -0800
-+++ b/CMakeLists.txt	2016-11-19 10:08:43.639992687 -0800
-@@ -139,7 +139,7 @@
- 
- set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS})
- target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
--target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} m)
-+target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} pthread m)
- 
- add_subdirectory(docs)
- 
diff --git a/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0003-add-openssl-dependency.patch b/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0003-add-openssl-dependency.patch
deleted file mode 100644
index c39520f85f..0000000000
--- a/packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0003-add-openssl-dependency.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libgamestream/CMakeLists.txt
-+++ b/libgamestream/CMakeLists.txt
-@@ -27,7 +27,7 @@ set_target_properties(moonlight-common P
- target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS})
- target_include_directories(moonlight-common PRIVATE ../third_party/moonlight-common-c/reedsolomon ${ENET_INCLUDE_DIRS})
- target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES})
--target_link_libraries(moonlight-common ${ENET_LIBRARIES})
-+target_link_libraries(moonlight-common ${ENET_LIBRARIES} ${OPENSSL_LIBRARIES})
- 
- target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
- 
diff --git a/packages/addons/script/moonlight/changelog.txt b/packages/addons/script/moonlight/changelog.txt
deleted file mode 100644
index 4c2bfe7ed8..0000000000
--- a/packages/addons/script/moonlight/changelog.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-109
-- updated moonlight-embedded and moonlight-common-c
-
-108
-- update to moonlight-4d94439
-
-107
-- updated moonlight-embedded and moonlight-common-c
-
-106
-- rebuild
-
-105
-- update moonlight-embedded to support GFE 3.2
-
-104
-- update moonlight-common-c to support GFE 3.2
-
-103
-- update Moonlight to 2.2.2
-
-102
-- update Moonlight to 2.2.1
-
-101
-- initial addon
diff --git a/packages/addons/script/moonlight/icon/icon.png b/packages/addons/script/moonlight/icon/icon.png
deleted file mode 100644
index 3a4bb5533c..0000000000
Binary files a/packages/addons/script/moonlight/icon/icon.png and /dev/null differ
diff --git a/packages/addons/script/moonlight/package.mk b/packages/addons/script/moonlight/package.mk
index 3018b8bd7a..8550ebc095 100644
--- a/packages/addons/script/moonlight/package.mk
+++ b/packages/addons/script/moonlight/package.mk
@@ -17,58 +17,24 @@
 ################################################################################
 
 PKG_NAME="moonlight"
-PKG_VERSION="4d94439"
-PKG_SHA256="5190f9c3a0fd17c7c8f0de8c2509f4749a2f399b7dc4d1402dd55c6f351260b2"
-PKG_VERSION_NUMBER="2.2.2"
-PKG_REV="109"
+PKG_VERSION="1.0"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/dead/script.moonlight"
-PKG_URL="https://github.com/dead/script.moonlight/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="script.moonlight-$PKG_VERSION*"
-PKG_DEPENDS_TARGET="toolchain moonlight-embedded"
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="script"
-PKG_SHORTDESC="Moonlight: implementation of NVIDIA's GameStream protocol"
-PKG_LONGDESC="Moonlight ($PKG_VERSION_NUMBER): allows you to stream your collection of games from your PC (with NVIDIA Gamestream) to your device and play them remotely"
+PKG_SHORTDESC="Moonlight: Add-on removed"
+PKG_LONGDESC="Moonlight Add-on removed"
 PKG_TOOLCHAIN="manual"
 
+PKG_ADDON_BROKEN="Moonlight is no longer maintained."
+
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Moonlight"
-PKG_ADDON_TYPE="xbmc.service.pluginsource"
-PKG_ADDON_PROVIDES="executable"
-
-post_unpack() {
-  # don't use the files from the script
-  rm $PKG_BUILD/script.moonlight/icon.png
-  rm $PKG_BUILD/script.moonlight/changelog.txt
-}
+PKG_ADDON_TYPE="xbmc.broken"
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp -PR $PKG_BUILD/script.moonlight/* $ADDON_BUILD/$PKG_ADDON_ID
-
-    # use our own changelog.txt
-    cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
-
-    # let's use our addon.xml instead
-    rm $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir moonlight-embedded)/.$TARGET_NAME/moonlight $ADDON_BUILD/$PKG_ADDON_ID/bin
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-    cp $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libgamestream/libgamestream.so.2.4.6 $ADDON_BUILD/$PKG_ADDON_ID/lib
-    cp $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libgamestream/libmoonlight-common.so.2.4.6 $ADDON_BUILD/$PKG_ADDON_ID/lib
-
-    if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
-      cp -P $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libmoonlight-pi.so $ADDON_BUILD/$PKG_ADDON_ID/lib
-    elif [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
-      cp -P $(get_build_dir moonlight-embedded)/.$TARGET_NAME/libmoonlight-aml.so $ADDON_BUILD/$PKG_ADDON_ID/lib
-    fi
-
-    cp $(get_build_dir libevdev)/.install_pkg/usr/lib/libevdev.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib
-
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/etc
-    cp -P $(get_build_dir moonlight-embedded)/moonlight.conf $ADDON_BUILD/$PKG_ADDON_ID/etc
-    cp -P $(get_build_dir moonlight-embedded)/gamecontrollerdb.txt $ADDON_BUILD/$PKG_ADDON_ID/etc
+  :
 }