diff --git a/pycardium/modules/py/bme680.py b/pycardium/modules/py/bme680.py
new file mode 100644
index 0000000000000000000000000000000000000000..d6f32f49300f943bc0fb76051e7f8e086d54884f
--- /dev/null
+++ b/pycardium/modules/py/bme680.py
@@ -0,0 +1,38 @@
+import sys_bme680
+import ucollections
+
+# Import old module for compatibility
+from sys_bme680 import *  # noqa
+
+Bme680Data = ucollections.namedtuple(
+    "Bme680Data", ["temperature", "humidity", "pressure", "gas_resistance"]
+)
+
+
+class Bme680:
+    def __init__(self):
+        sys_bme680.init()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.close()
+
+    def get_data(self):
+        return Bme680Data(*sys_bme680.get_data())
+
+    def close(self):
+        sys_bme680.deinit()
+
+    def temperature(self):
+        return self.get_data().temperature
+
+    def humidity(self):
+        return self.get_data().humidity
+
+    def pressure(self):
+        return self.get_data().pressure
+
+    def gas_resistance(self):
+        return self.get_data().gas_resistance
diff --git a/pycardium/modules/py/meson.build b/pycardium/modules/py/meson.build
index 75bf937c7b2d394d0834542e333bb050328c0823..ade56b1404c0b00eec07a70716ac96d75c8d802a 100644
--- a/pycardium/modules/py/meson.build
+++ b/pycardium/modules/py/meson.build
@@ -1,5 +1,6 @@
 python_modules = files(
   'bhi160.py',
+  'bme680.py',
   'color.py',
   'htmlcolor.py',
   'display.py',
diff --git a/pycardium/modules/qstrdefs.h b/pycardium/modules/qstrdefs.h
index 1c48037060bb14ded87839d4bdb2ff63a83c31cf..0ff0a8caac12fff03bcdb18b781a091a5784e98e 100644
--- a/pycardium/modules/qstrdefs.h
+++ b/pycardium/modules/qstrdefs.h
@@ -104,7 +104,7 @@ Q(stop)
 Q(read)
 
 /* bme680 */
-Q(bme680)
+Q(sys_bme680)
 Q(init)
 Q(deinit)
 Q(get_data)
diff --git a/pycardium/modules/sys_bme680.c b/pycardium/modules/sys_bme680.c
index ca4aca6d1dcb5d4f06c81ba20458f01bdafdb316..f6899c77c187c4d0d536fb41c14428d449bf62be 100644
--- a/pycardium/modules/sys_bme680.c
+++ b/pycardium/modules/sys_bme680.c
@@ -46,7 +46,7 @@ static mp_obj_t mp_bme680_get_data()
 static MP_DEFINE_CONST_FUN_OBJ_0(bme680_get_data_obj, mp_bme680_get_data);
 
 static const mp_rom_map_elem_t bme680_module_globals_table[] = {
-	{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bme680) },
+	{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sys_bme680) },
 	{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&bme680_init_obj) },
 	{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bme680_deinit_obj) },
 	{ MP_ROM_QSTR(MP_QSTR_get_data), MP_ROM_PTR(&bme680_get_data_obj) },
@@ -59,4 +59,4 @@ const mp_obj_module_t bme680_module = {
 };
 
 /* Register the module to make it available in Python */
-MP_REGISTER_MODULE(MP_QSTR_bme680, bme680_module, MODULE_BME680_ENABLED);
+MP_REGISTER_MODULE(MP_QSTR_sys_bme680, bme680_module, MODULE_BME680_ENABLED);