diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758c3879bce1..3ce72dd31fcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 ### Fixed
+- OneWire-Stickbreaker (DS18x20) library support for ESP32S2 (#14338)
 
 ## [2022.01.2] 20220116
 ### Added
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f9a3c55e1018..c0846c52ab54 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -146,5 +146,6 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - ESP32 LedPwmMode exception [#14073](https://github.com/arendst/Tasmota/issues/14073)
 - ESP32 Compile error when I2S_Audio is enabled [#14095](https://github.com/arendst/Tasmota/issues/14095)
 - ESP32 Provide proper OTA_URL for tasmota32solo1 [#14202](https://github.com/arendst/Tasmota/issues/14202)
+- ESP32 OneWire-Stickbreaker (DS18x20) library support for ESP32C3 and ESP32S2 [#14338](https://github.com/arendst/Tasmota/issues/14338)
 
 ### Removed
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.cpp b/lib/lib_basic/OneWire-Stickbreaker/OneWire.cpp
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.cpp
rename to lib/lib_basic/OneWire-Stickbreaker/OneWire.cpp
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h b/lib/lib_basic/OneWire-Stickbreaker/OneWire.h
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/OneWire.h
rename to lib/lib_basic/OneWire-Stickbreaker/OneWire.h
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/README.md b/lib/lib_basic/OneWire-Stickbreaker/README.md
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/README.md
rename to lib/lib_basic/OneWire-Stickbreaker/README.md
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS18x20_Temperature/DS18x20_Temperature.pde b/lib/lib_basic/OneWire-Stickbreaker/examples/DS18x20_Temperature/DS18x20_Temperature.pde
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS18x20_Temperature/DS18x20_Temperature.pde
rename to lib/lib_basic/OneWire-Stickbreaker/examples/DS18x20_Temperature/DS18x20_Temperature.pde
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS2408_Switch/DS2408_Switch.pde b/lib/lib_basic/OneWire-Stickbreaker/examples/DS2408_Switch/DS2408_Switch.pde
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS2408_Switch/DS2408_Switch.pde
rename to lib/lib_basic/OneWire-Stickbreaker/examples/DS2408_Switch/DS2408_Switch.pde
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS250x_PROM/DS250x_PROM.pde b/lib/lib_basic/OneWire-Stickbreaker/examples/DS250x_PROM/DS250x_PROM.pde
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/examples/DS250x_PROM/DS250x_PROM.pde
rename to lib/lib_basic/OneWire-Stickbreaker/examples/DS250x_PROM/DS250x_PROM.pde
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/keywords.txt b/lib/lib_basic/OneWire-Stickbreaker/keywords.txt
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/keywords.txt
rename to lib/lib_basic/OneWire-Stickbreaker/keywords.txt
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.json b/lib/lib_basic/OneWire-Stickbreaker/library.json
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.json
rename to lib/lib_basic/OneWire-Stickbreaker/library.json
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties b/lib/lib_basic/OneWire-Stickbreaker/library.properties
similarity index 100%
rename from lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties
rename to lib/lib_basic/OneWire-Stickbreaker/library.properties