diff --git a/init/init_matisse.cpp b/init/init_matisse.cpp
new file mode 100755
index 0000000..e12997f
--- /dev/null
+++ b/init/init_matisse.cpp
@@ -0,0 +1,91 @@
+/*
+ Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ Copyright (c) 2017-2018, The LineageOS Project. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <android-base/logging.h>
+#include <android-base/properties.h>
+
+#include "property_service.h"
+#include "vendor_init.h"
+
+#include "init_msm8226.h"
+
+using android::base::GetProperty;
+using android::init::property_set;
+
+void gsm_properties()
+{
+    property_set("ro.carrier", "wifi-only");
+    property_set("ro.radio.noril", "1");
+}
+
+void init_target_properties()
+{
+	std::string platform = GetProperty("ro.board.platform", "");
+	if (platform != ANDROID_TARGET)
+		return;
+	
+	std::string bootloader = GetProperty("ro.bootloader", "");
+	if (bootloader.find("T530NU") == 0) {
+		/* matissewifiue */
+		property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matissewifiue/matissewifi:5.0.2/LRX22G/T530NUU1BOJ4:user/release-keys");
+		property_override("ro.build.description", "matissewifiue-user 5.0.2 LRX22G T530NUU1BOJ4 release-keys");
+		property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T530NU");
+		property_override_dual("ro.product.device", "ro.vendor.product.device", "matissewifi");
+		gsm_properties();
+	} else if (bootloader.find("T530XX") == 0) {
+		/* matissewifixx */
+		property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXU1BOJ4:user/release-keys");
+		property_override("ro.build.description", "matissewifixx-user 5.0.2 LRX22G T530XXU1BOJ4 release-keys");
+		property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T530");
+		property_override_dual("ro.product.device", "ro.vendor.product.device", "matissewifi");
+		gsm_properties();
+	} else if (bootloader.find("T531XX") == 0) {
+		/* matisse3gxx */
+		property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXU1BOE6:user/release-keys");
+		property_override("ro.build.description", "matisse3gxx-user 5.0.2 LRX22G T531XXU1BOE6 release-keys");
+		property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T531");
+		property_override_dual("ro.product.device", "ro.vendor.product.device", "matisse3g");
+	} else if (bootloader.find("T535XX") == 0) {
+		/* matisseltexx */
+		property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXU1BOL1:user/release-keys");
+		property_override("ro.build.description", "matisseltexx-user 5.0.2 LRX22G T535XXU1BOL1 release-keys");
+		property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T535");
+		property_override_dual("ro.product.device", "ro.vendor.product.device", "matisselte");
+	} else {
+		gsm_properties();
+	}
+	
+	std::string device = GetProperty("ro.product.device", "");
+	LOG(ERROR) << "Found bootloader id " << bootloader <<  " setting build properties for "
+	<< device <<  " device" << std::endl;
+}