diff --git a/proprietary-files.txt b/proprietary-files.txt
index 8eeaa48..4ab434c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -206,7 +206,6 @@ vendor/bin/wlbtd
 vendor/etc/init/android.hardware.wifi@1.0-service.rc
 vendor/etc/init/hostapd.android.rc
 vendor/etc/init/vendor.samsung.hardware.wifi@2.0-service.rc
-vendor/etc/init/wifi.rc
 vendor/etc/init/wifi_slsi.rc
 vendor/etc/wifi/hydra_config.sdb
 vendor/etc/wifi/indoorchannel.info
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 5e6ad86..01fb3d7 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -32,3 +32,11 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE_STEM)
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := wifi.rc
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
+include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/wifi.rc b/rootdir/etc/wifi.rc
new file mode 100644
index 0000000..cff0d84
--- /dev/null
+++ b/rootdir/etc/wifi.rc
@@ -0,0 +1,75 @@
+# Wi-Fi init file
+on post-fs-data
+    mkdir /data/vendor/conn 0771 wifi wifi
+    mkdir /data/vendor/wifi 0771 wifi wifi
+    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
+    mkdir /data/vendor/log/wifi 0770 wifi system
+
+    # for WIFI TRP/TIS
+    chown wifi wifi /data/vendor/conn/.psm.info
+    chmod 0640 /data/vendor/conn/.psm.info
+
+    # for WIFI Antenna Selection
+    chown wifi wifi /data/vendor/conn/.ant.info
+    chmod 0640 /data/vendor/conn/.ant.info
+
+    # for WIFI Version
+    chown wifi wifi /data/vendor/conn/.wifiver.info
+    chmod 0644 /data/vendor/conn/.wifiver.info
+
+    # for WIFI MEMDUMP
+    # The default value of below memdump file is set in SecProductFeature
+    #write /data/vendor/conn/.memdump.info 2
+    chown wifi wifi /data/vendor/conn/.memdump.info
+    chmod 0640 /data/vendor/conn/.memdump.info
+
+    # for WIFI hotspot
+    chown wifi wifi /data/vendor/conn/.softap.info
+    chmod 0644 /data/vendor/conn/.softap.info
+    chown system wifi /vendor/etc/wifi/indoorchannel.info
+    chmod 0664 /vendor/etc/wifi/indoorchannel.info
+
+    # for WIFI MAC
+    chown wifi wifi /sys/wifi/mac_addr
+    chmod 0640 /sys/wifi/mac_addr
+
+on boot
+    setprop wifi.interface wlan0
+
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
+    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
+    -g@android:wpa_wlan0
+    class main
+    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
+    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
+    socket wpa_wlan0 dgram 660 wifi wifi
+    disabled
+    oneshot
+
+# start for WiFi MFG (TestMode)
+service mfgloader /system/vendor/bin/hw/mfgloader
+    class main
+    user wifi
+    group wifi inet net_raw net_admin
+    capabilities NET_ADMIN NET_RAW SYS_MODULE
+    disabled
+    oneshot
+
+service macloader /system/vendor/bin/hw/macloader
+    class main
+    user wifi
+    group wifi inet net_raw net_admin
+    capabilities NET_ADMIN NET_RAW SYS_MODULE
+    oneshot
+
+service wlandutservice /system/bin/wlandutservice
+    class main
+    user system
+    group system wifi net_raw net_admin inet
+    capabilities NET_ADMIN NET_RAW
+    disabled
+    oneshot
+
+# end of WiFi MFG (TestMode)
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 254b445..68bbbf0 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -94,7 +94,8 @@ PRODUCT_PACKAGES += \
     fstab.enableswap \
     init.exynos7904.rc \
     init.exynos7904.usb.rc \
-    ueventd.exynos7904.rc
+    ueventd.exynos7904.rc \
+    wifi.rc
 
 # Light
 PRODUCT_PACKAGES += \