diff --git a/_devices/samsunggalaxytabs84.markdown b/_devices/samsunggalaxytabs84.markdown
new file mode 100644
index 0000000..1fc509a
--- /dev/null
+++ b/_devices/samsunggalaxytabs84.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Samsung Galaxy Tab S 8.4"
+codename: klimtwifi
+downloadfolder: klimtwifi
+oldurl: http://teamw.in/project/twrp2/238
+supportstatus: Current
+maintainer: None
+oem: Samsung
+ddof: "/dev/block/platform/dw_mmc.0/by-name/RECOVERY"
+devicetree: "https://github.com/TeamWin/android_device_samsung_klimtwifi"
+xdathread: "http://forum.xda-developers.com/galaxy-tab-s/orig-development/recovery-twrp-2-7-1-0-touch-recovery-t2817100"
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}