diff --git a/galaxys2-common/common-vendor-blobs.mk b/galaxys2-common/common-vendor-blobs.mk
new file mode 100644
index 0000000..da1eaac
--- /dev/null
+++ b/galaxys2-common/common-vendor-blobs.mk
@@ -0,0 +1,30 @@
+# Copyright (C) 2012 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := vendor/samsung/galaxys2-common
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1.hcd:system/bin/bcm4330B1.hcd \
+    $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1_murata.hcd:system/bin/bcm4330B1_murata.hcd \
+    $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1_semcosh.hcd:system/bin/bcm4330B1_semcosh.hcd \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_apsta.bin:system/etc/wifi/bcmdhd_apsta.bin \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_mfg.bin:system/etc/wifi/bcmdhd_mfg.bin \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_p2p.bin:system/etc/wifi/bcmdhd_p2p.bin \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt_murata:system/etc/wifi/nvram_mfg.txt_murata \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt \
+    $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata \
+    $(LOCAL_PATH)/proprietary/system/lib/libsecril-client.so:system/lib/libsecril-client.so \
+    $(LOCAL_PATH)/proprietary/system/vendor/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin
diff --git a/galaxys2-common/common-vendor.mk b/galaxys2-common/common-vendor.mk
new file mode 100644
index 0000000..e358bee
--- /dev/null
+++ b/galaxys2-common/common-vendor.mk
@@ -0,0 +1,19 @@
+# Copyright (C) 2012 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Pick up overlay for features that depend on non-open-source files
+DEVICE_PACKAGE_OVERLAYS += vendor/samsung/galaxys2-common/overlay
+
+$(call inherit-product, vendor/samsung/galaxys2-common/common-vendor-blobs.mk)
+
diff --git a/galaxys2-common/proprietary/Android.mk b/galaxys2-common/proprietary/Android.mk
new file mode 100644
index 0000000..cfc22b3
--- /dev/null
+++ b/galaxys2-common/proprietary/Android.mk
@@ -0,0 +1,17 @@
+# Copyright (C) 2012 The Android Open Source Project
+# Copyright (C) 2012 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1.hcd b/galaxys2-common/proprietary/system/bin/bcm4330B1.hcd
new file mode 100755
index 0000000..b2397f8
Binary files /dev/null and b/galaxys2-common/proprietary/system/bin/bcm4330B1.hcd differ
diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd b/galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd
new file mode 100755
index 0000000..b2397f8
Binary files /dev/null and b/galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd differ
diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd b/galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd
new file mode 100755
index 0000000..b2397f8
Binary files /dev/null and b/galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd differ
diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin
new file mode 100755
index 0000000..21d558d
Binary files /dev/null and b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin differ
diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin
new file mode 100755
index 0000000..e3f9696
Binary files /dev/null and b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin differ
diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin
new file mode 100755
index 0000000..5755a91
Binary files /dev/null and b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin differ
diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin
new file mode 100755
index 0000000..5755a91
Binary files /dev/null and b/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin differ
diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt b/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt
new file mode 100755
index 0000000..0f69051
--- /dev/null
+++ b/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt
@@ -0,0 +1,97 @@
+manfid=0x2d0
+prodid=0x0532
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0532
+boardrev=0x20
+boardflags=0x10080201
+
+nocrc=1
+xtalfreq=37400
+xtalmode=0x20,0x4,0
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+ag0=253
+ag1=255
+aa2g=1
+aa5g=1
+ccode=ALL
+
+sd_gpout=0
+sd_oobonly=1
+
+# 2G PA para_SMST_0502
+pa0b0=5477
+pa0b1=64918
+pa0b2=65396
+#pa0itssit=62
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+
+# rssi params for 5GHz
+#rssismf5g=0x4
+rssismf5g=0xa
+rssismc5g=0x7
+rssisav5g=0x1
+#PA parameters for lower band
+pa1lob0=5408
+pa1lob1=64851
+pa1lob2=65337
+#PA parameters for midband
+pa1b0=5351
+pa1b1=64860
+pa1b2=65345
+#PA parameters for high band
+pa1hib0=4924
+pa1hib1=64895
+pa1hib2=65329
+
+# 2G PA offset
+maxp2ga0=72
+sromrev=3
+cckpo=0
+ofdm2gpo=0x66666666
+mcs2gpo0=0xaaaa
+mcs2gpo1=0xaaaa
+
+# 5G PA offset_0316
+maxp5ga0=71
+maxp5gla0=72
+maxp5gha0=72
+ofdm5gpo=0x55555555
+ofdm5glpo=0x55555555
+ofdm5ghpo=0x55555555
+mcs5gpo0=0x9999
+mcs5gpo1=0x9999
+mcs5glpo0=0x9999
+mcs5glpo1=0x9999
+mcs5ghpo0=0x9999
+mcs5ghpo1=0x9999
+
+cckPwrOffset=4
+cckdigfilttype=20
+ofdmdigfilttype=2
+#wl0id=0x431b
+extpagain5g=2
+rfreg033=0x19
+rfreg033_cck=0x1f
+pacalidx2g=65
+dacrate2g=160
+txalpfbyp2g=1
+bphyscale=17
+
+#5GHz Carrier
+txiqlopapu5g=1
+txiqlopag5g=0x10
+iqlocalidx5g=64
+
+# for BT-CO_EX
+btc_params80=0
+btc_params6=10
+btc_params8=10000
+
+
+swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff
+swctrlmap_5g=0xC040C040, 0xB030A020, 0x8000C040, 0x010A02, 0x2F8
+
diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata b/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata
new file mode 100755
index 0000000..39f31e6
--- /dev/null
+++ b/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata
@@ -0,0 +1,86 @@
+# Sample variables file for BCM94330 SD FCBGA AGB McLaren board
+# TSSI parameters are preliminary set on 08/09/2010
+# 5G parameter by Patrickz
+manfid=0x2d0
+prodid=0x0532
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0532
+boardrev=0x40
+#boardflags: has ext 5GHz lna, use a SP3T sw share with BT, 2.4GHz iLNA and iPA
+boardflags=0x10080a00
+nocrc=1
+xtalfreq=37400
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+ag0=255
+# aa2g=1 means by default only one antenna, MAIN RF.
+aa2g=1
+ccode=ALL
+# 2.4GHz PA parameters are preliminary
+#org pa0b0=0x1552
+pa0b0=0x1532
+pa0b1=0xfd97
+pa0b2=0xff70
+cckPwrOffset=4
+# rssi params for 2.4GHz
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+# rssi params for 5GHz
+rssismf5g=0xa
+rssismc5g=0x7
+rssisav5g=0x1
+#PA parameters for lower a-band
+#pa1lob0=0x153a
+pa1lob0=0x152a
+pa1lob1=0xfd56
+pa1lob2=0xff44
+#PA parameters for midband
+#pa1b0=0x1513
+pa1b0=0x14a3
+pa1b1=0xfd59
+pa1b2=0xff44
+#PA parameters for high band
+#pa1hib0=0x149e
+pa1hib0=0x13ee
+pa1hib1=0xfd66
+pa1hib2=0xff4a
+maxp2ga0=0x48
+ofdm2gpo=0x55555555
+mcs2gpo0=0x7777
+mcs2gpo1=0x7777
+maxp5ga0=0x48
+maxp5gla0=0x48
+maxp5gha0=0x48
+ofdm5gpo=0x55555555
+ofdm5glpo=0x55555555
+ofdm5ghpo=0x55555555
+mcs5gpo0=0x7777
+mcs5gpo1=0x7777
+mcs5glpo0=0x7777
+mcs5glpo1=0x7777
+mcs5ghpo0=0x7777
+mcs5ghpo1=0x7777
+sromrev=3
+#il0macaddr=00:90:4c:c5:12:38
+#wl0id=0x431b
+# support A band ext PA
+extpagain5g=2
+rfreg033=0x1f
+pacalidx2g=65
+dacrate2g=160
+# 2/28 for mask
+txalpfbyp2g=1
+cckdigfilttype=21
+ofdmdigfilttype=2
+txiqlopapu5g=1
+txiqlopag5g=0x10
+iqlocalidx5g=64
+
+# 3/7 for EVM
+triso5g=8
+sd_gpout=0
+sd_oobonly=1
+swctrlmap_2g=0x04040404,0x02020202,0x04040404,0x010202,0x1ff
+swctrlmap_5g=0x50505050,0x28282020,0x20202020,0x010202,0x2f8
diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt b/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt
new file mode 100755
index 0000000..61df36d
--- /dev/null
+++ b/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt
@@ -0,0 +1,113 @@
+manfid=0x2d0
+prodid=0x0532
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0532
+boardrev=0x20
+boardflags=0x10080201
+
+nocrc=1
+xtalfreq=37400
+xtalmode=0x20,0x4,0
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+ag0=255
+ag1=255
+aa2g=1
+ccode=GB
+
+btc_params80=0
+btc_params6=10
+btc_params8=10000
+
+sd_gpout=0
+sd_oobonly=1
+
+# 2G PA param
+pa0b0=0x14AA
+pa0b1=0xFDB3
+pa0b2=0xFF6F
+#pa0itssit=62
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+
+# rssi params for 5GHz B42_110728
+#rssismf5g=0x4
+rssismf5g=0xa
+rssismc5g=0x7
+rssisav5g=0x1
+#PA parameters for lower band
+pa1lob0=4676
+pa1lob1=64858
+pa1lob2=65301
+#PA parameters for midband
+pa1b0=4445
+pa1b1=64883
+pa1b2=65310
+#PA parameters for high band
+pa1hib0=4567
+pa1hib1=64876
+pa1hib2=65332
+
+# 2G PA offset
+maxp2ga0=76
+sromrev=3
+cckpo=0
+ofdm2gpo=0x66666666
+mcs2gpo0=0xaaaa
+mcs2gpo1=0xaaaa
+
+# 5G PA offset
+maxp5ga0=66
+maxp5gla0=66
+maxp5gha0=66
+ofdm5gpo=0x66666666
+ofdm5glpo=0x66666666
+ofdm5ghpo=0x55555555
+mcs5gpo0=0x6666
+mcs5gpo1=0x6666
+mcs5glpo0=0x6666
+mcs5glpo1=0x6666
+mcs5ghpo0=0x6666
+mcs5ghpo1=0x6666
+
+cckPwrOffset=4
+cckdigfilttype=21
+ofdmdigfilttype=2
+extpagain5g=2
+#wl0id=0x431b
+
+# For 2GHz Tx EVM/SM
+rfreg033=0x19
+rfreg033_cck=0x1f
+pacalidx2g=65
+dacrate2g=160
+txalpfbyp2g=1
+bphyscale=17
+
+#5GHz LOFT and IQ CAL
+txgaintbl5g=1
+txiqlopapu5g=1
+txiqlopag5g=0x10
+iqlocalidx5g=24
+#iqlocalidx5g=64 to 24
+
+# 5GHz Noise CAL parameter
+noise_cal_po_5g=5
+noise_cal_enable_5g=0
+
+# 2GHz RxPER at low rates
+noise_cal_ref_2g=56
+noise_cal_po_bias_2g=-4
+noise_cal_enable_2g=1
+
+# Max input level on a-band
+triso5g=9
+
+# Tx power control, especially temp.
+#tssitime=1
+
+swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff
+swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8
+
diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata b/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata
new file mode 100755
index 0000000..67b4998
--- /dev/null
+++ b/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata
@@ -0,0 +1,86 @@
+# Sample variables file for BCM94330 SD FCBGA AGB McLaren board
+# TSSI parameters are preliminary set on 08/09/2010
+# 5G parameter by Patrickz
+manfid=0x2d0
+prodid=0x0532
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0532
+boardrev=0x40
+#boardflags: has ext 5GHz lna, use a SP3T sw share with BT, 2.4GHz iLNA and iPA
+boardflags=0x10080a00
+nocrc=1
+xtalfreq=37400
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+ag0=255
+# aa2g=1 means by default only one antenna, MAIN RF.
+aa2g=1
+ccode=GB
+# 2.4GHz PA parameters are preliminary
+#org pa0b0=0x1552
+pa0b0=0x1532
+pa0b1=0xfd97
+pa0b2=0xff70
+cckPwrOffset=4
+# rssi params for 2.4GHz
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+# rssi params for 5GHz
+rssismf5g=0xa
+rssismc5g=0x7
+rssisav5g=0x1
+#PA parameters for lower a-band
+#pa1lob0=0x153a
+pa1lob0=0x152a
+pa1lob1=0xfd56
+pa1lob2=0xff44
+#PA parameters for midband
+#pa1b0=0x1513
+pa1b0=0x14a3
+pa1b1=0xfd59
+pa1b2=0xff44
+#PA parameters for high band
+#pa1hib0=0x149e
+pa1hib0=0x13ee
+pa1hib1=0xfd66
+pa1hib2=0xff4a
+maxp2ga0=0x48
+ofdm2gpo=0x55555555
+mcs2gpo0=0x7777
+mcs2gpo1=0x7777
+maxp5ga0=0x48
+maxp5gla0=0x48
+maxp5gha0=0x48
+ofdm5gpo=0x55555555
+ofdm5glpo=0x55555555
+ofdm5ghpo=0x55555555
+mcs5gpo0=0x7777
+mcs5gpo1=0x7777
+mcs5glpo0=0x7777
+mcs5glpo1=0x7777
+mcs5ghpo0=0x7777
+mcs5ghpo1=0x7777
+sromrev=3
+#il0macaddr=00:90:4c:c5:12:38
+#wl0id=0x431b
+# support A band ext PA
+extpagain5g=2
+rfreg033=0x1f
+pacalidx2g=65
+dacrate2g=160
+# 2/28 for mask
+txalpfbyp2g=1
+cckdigfilttype=21
+ofdmdigfilttype=2
+txiqlopapu5g=1
+txiqlopag5g=0x10
+iqlocalidx5g=64
+
+# 3/7 for EVM
+triso5g=8
+sd_gpout=0
+sd_oobonly=1
+swctrlmap_2g=0x04040404,0x02020202,0x04040404,0x010202,0x1ff
+swctrlmap_5g=0x50505050,0x28282020,0x20202020,0x010202,0x2f8
diff --git a/galaxys2-common/proprietary/system/lib/libsecril-client.so b/galaxys2-common/proprietary/system/lib/libsecril-client.so
new file mode 100755
index 0000000..6f5eca5
Binary files /dev/null and b/galaxys2-common/proprietary/system/lib/libsecril-client.so differ
diff --git a/galaxys2-common/proprietary/system/vendor/firmware/mfc_fw.bin b/galaxys2-common/proprietary/system/vendor/firmware/mfc_fw.bin
new file mode 100644
index 0000000..21a82ad
Binary files /dev/null and b/galaxys2-common/proprietary/system/vendor/firmware/mfc_fw.bin differ