diff --git a/Makefile b/Makefile
index 0c56ade..4691323 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ NPERSHELF=16
 CONF_SCRIPTS = aoe-discover aoe-interfaces aoe-mkshelf aoe-revalidate aoe-flush aoe-stat
 PROGS = aoeping aoecfg aoe-sancheck
 COMMANDS := ${CONF_SCRIPTS} aoe-mkdevs aoe-version coraid-update ${PROGS}
-CFLAGS = -Wall -O -g
+CFLAGS += -Wall -O -g ${CPPFLAGS}
 SANCHECKLIBS = -lpthread
 
 AOE_PING_OBJ = aoeping.o linux.o
@@ -68,17 +68,17 @@ clean :
 	rm -f ${CONF_SCRIPTS} ${AOE_PING_OBJ} ${AOE_CFG_OBJ} ${SANCHECK_OBJ} ${PROGS}
 
 aoeping : ${AOE_PING_OBJ}
-	${CC} ${CFLAGS} -o $@ ${AOE_PING_OBJ}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_PING_OBJ}
 aoeping.o : aoeping.c dat.h fns.h
 	${CC} ${CFLAGS} -o $@ -c $<
 linux.o : linux.c config.h
 	${CC} ${CFLAGS} -o $@ -c $<
 aoecfg: ${AOE_CFG_OBJ}
-	${CC} ${CFLAGS} -o $@ ${AOE_CFG_OBJ}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_CFG_OBJ}
 aoecfg.o : aoecfg.c dat.h fns.h
 	${CC} ${CFLAGS} -o $@ -c $<
 aoe-sancheck : ${SANCHECK_OBJ}
-	-$(CC) $(CFLAGS) -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS)
+	-$(CC) $(CFLAGS) ${LDFLAGS} -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS)
 aoe-sancheck.o : aoe-sancheck.c
 	-$(CC) $(CFLAGS) -o $@ -c $<
 
diff --git a/aoe-mkdevs b/aoe-mkdevs
index 65962e6..128a08a 100755
--- a/aoe-mkdevs
+++ b/aoe-mkdevs
@@ -23,7 +23,7 @@ $zero: Exiting.
 EOF
 	exit 1
 fi
-if test "`ps axwwww | grep 'udev[d]'`" || test -d "/dev/.udev"; then
+if test "`ps axwwww | grep 'udev[d]'`" || test -d "/run/udev" || test -d "/dev/.udev"; then
 	cat 1>&2 <<EOF
 $zero Error: udev detected.  You shouldn't need to use $zero.
 $zero: Please see the aoe-mkdevs manpage.
@@ -56,6 +56,6 @@ export n_partitions
 mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`
 i=0
 while test $i -lt $n_shelves; do
-	sh $mkshelf $dir $i
+	$mkshelf $dir $i
 	i=`expr $i + 1`
 done
diff --git a/aoe-mkshelf.in b/aoe-mkshelf.in
index 7fbbd44..f81e087 100755
--- a/aoe-mkshelf.in
+++ b/aoe-mkshelf.in
@@ -18,7 +18,7 @@ $zero: Exiting.
 EOF
 	exit 1
 fi
-if test "`ps axwwww | grep 'udev[d]'`" || test -d "/dev/.udev"; then
+if test "`ps axwwww | grep 'udev[d]'`" || test -d "/run/udev" || test -d "/dev/.udev"; then
 	cat 1>&2 <<EOF
 $zero Error: udev detected.  You shouldn't need to use $zero.
 $zero: Please see the aoe-mkshelf manpage.