diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff924d5d..fda8f1a4 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,20 +12,20 @@ check_lib_reversion:
     - GIT_COMMIT_ID=`git log --pretty="%s" -1 | grep -o '([0-9a-f]*)' | tail -1 | cut -c 2-8`
     - echo "GIT_COMMIT_ID is "$GIT_COMMIT_ID
     - test $(echo -n $GIT_COMMIT_ID | wc -c) -eq 7
-    - grep $GIT_COMMIT_ID libcoexist.a
-    - grep $GIT_COMMIT_ID libcore.a
-    - grep $GIT_COMMIT_ID libespnow.a
-    - grep $GIT_COMMIT_ID libespnow.a
-    - grep $GIT_COMMIT_ID libnet80211.a
-    - grep $GIT_COMMIT_ID libpp.a
-    - grep $GIT_COMMIT_ID libsmartconfig.a
-    - grep $GIT_COMMIT_ID-remote libnet80211.a
-    - test $(grep $GIT_COMMIT_ID-dirty *.a | wc -l) -eq 0
-    - test $(xtensa-esp32-elf-nm *.a | grep -w printf | wc -l) -eq 0
-    - test $(xtensa-esp32-elf-nm *.a | grep -w ets_printf | wc -l) -eq 0
-    - if [ -e libwps.a ]; then exit 1; fi
-    - if [ -e libwpa.a ]; then exit 1; fi
-    - if [ -e libwpa2.a ]; then exit 1; fi
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libcore.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libespnow.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libespnow.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libnet80211.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libpp.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID $dir/libsmartconfig.a; done;
+    - for dir in esp32 esp32s2beta; do grep $GIT_COMMIT_ID-remote $dir/libnet80211.a; done;
+    - for dir in esp32 esp32s2beta; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done;
+    - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done;
+    - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done;
+    - for dir in esp32 esp32s2beta; do if [ -e $dir/libwps.a ]; then exit 1; fi; done;
+    - for dir in esp32 esp32s2beta; do if [ -e $dir/libwpa.a ]; then exit 1; fi; done;
+    - for dir in esp32 esp32s2beta; do if [ -e $dir/libwpa2.a ]; then exit 1; fi; done;
 
 
 push_master_to_github:
diff --git a/README.rst b/README.rst
index 5d941046..68b0668b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 ESP32 WiFi Stack Libraries
 ====================
 
-This repository contains binary libraries supporting the ESP32 RF subsystems. It is used as a submodule within `Espressif IoT Development Framework`_ (ESP-IDF).
+This repository contains binary libraries supporting the ESP32 series RF subsystems. It is used as a submodule within `Espressif IoT Development Framework`_ (ESP-IDF).
 
 Files in this repository are Copyright (C) 2015-2016 Espressif Systems.
 
diff --git a/libcoexist.a b/esp32/libcoexist.a
similarity index 100%
rename from libcoexist.a
rename to esp32/libcoexist.a
diff --git a/libcore.a b/esp32/libcore.a
similarity index 100%
rename from libcore.a
rename to esp32/libcore.a
diff --git a/libespnow.a b/esp32/libespnow.a
similarity index 100%
rename from libespnow.a
rename to esp32/libespnow.a
diff --git a/libmesh.a b/esp32/libmesh.a
similarity index 100%
rename from libmesh.a
rename to esp32/libmesh.a
diff --git a/libnet80211.a b/esp32/libnet80211.a
similarity index 100%
rename from libnet80211.a
rename to esp32/libnet80211.a
diff --git a/libphy.a b/esp32/libphy.a
similarity index 100%
rename from libphy.a
rename to esp32/libphy.a
diff --git a/libpp.a b/esp32/libpp.a
similarity index 100%
rename from libpp.a
rename to esp32/libpp.a
diff --git a/librtc.a b/esp32/librtc.a
similarity index 100%
rename from librtc.a
rename to esp32/librtc.a
diff --git a/libsmartconfig.a b/esp32/libsmartconfig.a
similarity index 100%
rename from libsmartconfig.a
rename to esp32/libsmartconfig.a
diff --git a/esp32s2beta/libcoexist.a b/esp32s2beta/libcoexist.a
new file mode 100644
index 00000000..05be99eb
Binary files /dev/null and b/esp32s2beta/libcoexist.a differ
diff --git a/esp32s2beta/libcore.a b/esp32s2beta/libcore.a
new file mode 100644
index 00000000..e2275e17
Binary files /dev/null and b/esp32s2beta/libcore.a differ
diff --git a/esp32s2beta/libespnow.a b/esp32s2beta/libespnow.a
new file mode 100644
index 00000000..5f8b5f17
Binary files /dev/null and b/esp32s2beta/libespnow.a differ
diff --git a/esp32s2beta/libmesh.a b/esp32s2beta/libmesh.a
new file mode 100644
index 00000000..2238e305
Binary files /dev/null and b/esp32s2beta/libmesh.a differ
diff --git a/esp32s2beta/libnet80211.a b/esp32s2beta/libnet80211.a
new file mode 100644
index 00000000..398a329b
Binary files /dev/null and b/esp32s2beta/libnet80211.a differ
diff --git a/esp32s2beta/libphyA.a b/esp32s2beta/libphyA.a
new file mode 100755
index 00000000..8fda568c
Binary files /dev/null and b/esp32s2beta/libphyA.a differ
diff --git a/esp32s2beta/libphyB.a b/esp32s2beta/libphyB.a
new file mode 100755
index 00000000..c41518ae
Binary files /dev/null and b/esp32s2beta/libphyB.a differ
diff --git a/esp32s2beta/libphy_marlin3.a b/esp32s2beta/libphy_marlin3.a
new file mode 100755
index 00000000..47343240
Binary files /dev/null and b/esp32s2beta/libphy_marlin3.a differ
diff --git a/esp32s2beta/libpp.a b/esp32s2beta/libpp.a
new file mode 100644
index 00000000..c6b7e843
Binary files /dev/null and b/esp32s2beta/libpp.a differ
diff --git a/esp32s2beta/librtc.a b/esp32s2beta/librtc.a
new file mode 100644
index 00000000..50a87f1e
Binary files /dev/null and b/esp32s2beta/librtc.a differ
diff --git a/esp32s2beta/libsmartconfig.a b/esp32s2beta/libsmartconfig.a
new file mode 100644
index 00000000..b207bfa7
Binary files /dev/null and b/esp32s2beta/libsmartconfig.a differ
diff --git a/fix_printf.sh b/fix_printf.sh
index 9192e603..28b903ef 100755
--- a/fix_printf.sh
+++ b/fix_printf.sh
@@ -1,10 +1,24 @@
 #!/bin/bash
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a 
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=pp_printf libpp.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a 
-xtensa-esp32-elf-objcopy --redefine-sym printf=core_printf libcore.a 
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a 
-xtensa-esp32-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
-xtensa-esp32-elf-objcopy --redefine-sym printf=coexist_printf libcoexist.a
+for dir in esp32 esp32s2beta; do
+    if [ -d "$dir" ]; then
+        cd $dir
+        if [ $dir == esp32 ]; then
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy.a 
+        elif [ $dir == esp32s2beta ]; then
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphyA.a
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphyB.a
+            xtensa-esp32-elf-objcopy --redefine-sym ets_printf=phy_printf libphy_marlin3.a
+        fi
+        xtensa-esp32-elf-objcopy --redefine-sym ets_printf=rtc_printf librtc.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=sc_printf libsmartconfig.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=pp_printf libpp.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=net80211_printf libnet80211.a 
+        xtensa-esp32-elf-objcopy --redefine-sym printf=core_printf libcore.a 
+        xtensa-esp32-elf-objcopy --redefine-sym ets_printf=core_printf libcore.a 
+        xtensa-esp32-elf-objcopy --redefine-sym ets_printf=coexist_printf libcoexist.a
+        xtensa-esp32-elf-objcopy --redefine-sym printf=coexist_printf libcoexist.a
+        cd ..
+    else
+        echo "$dir does not exist"
+    fi
+done;