diff --git a/device.mk b/device.mk
index 1073f9e..adbf744 100644
--- a/device.mk
+++ b/device.mk
@@ -83,7 +83,8 @@ PRODUCT_COPY_FILES += \
 
 # Ramdisk
 PRODUCT_PACKAGES += \
-    init.clover.rc
+    init.clover.rc \
+    init.macaddress_setup.sh
 
 # Screen density
 PRODUCT_AAPT_CONFIG := large
diff --git a/rootdir/bin/init.macaddress_setup.sh b/rootdir/bin/init.macaddress_setup.sh
new file mode 100755
index 0000000..70063fc
--- /dev/null
+++ b/rootdir/bin/init.macaddress_setup.sh
@@ -0,0 +1,46 @@
+#! /vendor/bin/sh
+
+# Copyright (c) 2013, The Linux Foundation. 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 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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.
+#
+
+MACADDRESS=/persist/wlan_mac.bin
+MACADDRESSVENDOR=/vendor/firmware/wlan/qca_cld/wlan_mac.bin
+
+# Mount vendor with read write permission
+mount -o remount,rw /vendor 
+
+# Remove old wlan_mac.bin file in vendor
+rm -f /vendor/firmware/wlan/qca_cld/wlan_mac.bin
+
+# Read out  WiFi Mac Address
+macaddr=$(printf "%b"  | od -An -t x1 -w6 -N6  $MACADDRESS | tr -d '\n ')
+
+# Write new Mac Adress in Vendor
+echo -e  "Intf0MacAddress=$macaddr" "\nEND">$MACADDRESSVENDOR
+
+# Mount vendor with read only permission
+mount -o remount,ro /vendor
diff --git a/rootdir/etc/init.clover.rc b/rootdir/etc/init.clover.rc
index b00343a..24c9c63 100644
--- a/rootdir/etc/init.clover.rc
+++ b/rootdir/etc/init.clover.rc
@@ -34,4 +34,13 @@ on property:sys.incall=true
     write /sys/class/power_supply/battery/constant_charge_current_max 500000
 
 on property:sys.incall=false
-    write /sys/class/power_supply/battery/constant_charge_current_max 2000000
+    write /sys/class/power_supply/battery/constant_charge_current_max 1000000
+    
+on boot
+	start macaddress_setup
+	
+service macaddress_setup /vendor/bin/sh /vendor/bin/init.macaddress_setup.sh
+   class main
+   user root
+   group root
+   oneshot