diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index 658d5078a0..80b6532a1c 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.17"
+PKG_VERSION="1.18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index a66a3cc5d7..8b6246f1f7 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -50,18 +50,22 @@ if [ -z "$1" ]; then
 fi
 
 DISK="$1"
-if [ "$DISK" = "/dev/mmcblk0" ]; then
-  PART1="${DISK}p1"
-  PART2="${DISK}p2"
-elif [ "$DISK" = "/dev/loop0" ]; then
-  PART1="${DISK}p1"
-  PART2="${DISK}p2"
-  IMGFILE="$2"
-  losetup $DISK $IMGFILE
-else
-  PART1="${DISK}1"
-  PART2="${DISK}2"
-fi
+case $DISK in
+  "/dev/mmcblk1"*)
+    PART1="${DISK}p1"
+    PART2="${DISK}p2"
+    ;;
+  "/dev/loop"*)
+    PART1="${DISK}p1"
+    PART2="${DISK}p2"
+    IMGFILE="$2"
+    losetup $DISK $IMGFILE
+    ;;
+  *)
+    PART1="${DISK}1"
+    PART2="${DISK}2"
+    ;;
+esac
 
 clear
 echo "#########################################################"