diff --git a/device/galaxy-s2/common.sh b/device/galaxy-s2/common.sh
index edaec49..8d4b678 100644
--- a/device/galaxy-s2/common.sh
+++ b/device/galaxy-s2/common.sh
@@ -19,7 +19,11 @@ device_init() {
 
     # the block device on which REPIT will operate (only one device is supported):
 
-    sdev=/sys/devices/platform/dw_mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0
+    # exynos 4210:
+    #sdev=/sys/devices/platform/dw_mmc/mmc_host/mmc0/mmc0:0001/block/mmcblk0
+    # omap 4430:
+    #sdev=/sys/devices/platform/omap/omap_hsmmc.1/mmc_host/mmc0/mmc0:0001/block/mmcblk0
+    sdev=/sys/block/mmcblk0
     spar=$sdev/mmcblk0p
 
     ddev=/dev/block/mmcblk0
diff --git a/device/galaxy-s2/d710.sh b/device/galaxy-s2/exynos-4210/d710.sh
similarity index 100%
rename from device/galaxy-s2/d710.sh
rename to device/galaxy-s2/exynos-4210/d710.sh
diff --git a/device/galaxy-s2/i777.sh b/device/galaxy-s2/exynos-4210/i777.sh
similarity index 100%
rename from device/galaxy-s2/i777.sh
rename to device/galaxy-s2/exynos-4210/i777.sh
diff --git a/device/galaxy-s2/i9100.sh b/device/galaxy-s2/exynos-4210/i9100.sh
similarity index 100%
rename from device/galaxy-s2/i9100.sh
rename to device/galaxy-s2/exynos-4210/i9100.sh
diff --git a/device/galaxy-s2/n7000.sh b/device/galaxy-s2/exynos-4210/n7000.sh
similarity index 100%
rename from device/galaxy-s2/n7000.sh
rename to device/galaxy-s2/exynos-4210/n7000.sh
diff --git a/device/galaxy-s2/omap-4430/i9100g.sh b/device/galaxy-s2/omap-4430/i9100g.sh
new file mode 100644
index 0000000..4f2740d
--- /dev/null
+++ b/device/galaxy-s2/omap-4430/i9100g.sh
@@ -0,0 +1,26 @@
+#####################################################
+# Lanchon REPIT - Device Handler                    #
+# Copyright 2016, Lanchon                           #
+#####################################################
+
+#####################################################
+# Lanchon REPIT is free software licensed under     #
+# the GNU General Public License (GPL) version 3    #
+# and any later version.                            #
+#####################################################
+
+### i9100g
+
+device_checkDevice() {
+
+    checkTool getprop
+
+    case ":$(getprop ro.product.device):$(getprop ro.build.product):" in
+        *:i9100g:*) ;;
+        *:GT-I9100G:*) ;;
+        *)
+            fatal "this package is for '$deviceName' devices; this device is '$(getprop ro.product.device)'"
+            ;;
+    esac
+
+}