diff --git a/configure.ac b/configure.ac
index 342fb9ad0..4a46f3be8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,18 +385,7 @@ case $host_os in
 
   *darwin*)
     have_darwin="yes"
-    # Make sure the proper Mac SDK is installed
-    if test ! -d /Developer/SDKs/MacOSX10.5.sdk; then
-      cat << EOF
-You need to install the Mac OS X 10.5 SDK in order to build Transmission:
-  Get your Xcode CD or package
-  Restart the install
-  When it gets to "Installation Type", select "Customize"
-  Select "Mac OS X 10.5 SDK" under "Cross Development"
-  Finish the install.
-EOF
-      exit 1
-    fi
+    CFLAGS="-DMACOSX $CFLAGS"
     ;;
 
 esac
@@ -420,6 +409,21 @@ AC_ARG_ENABLE([daemon],
 AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
 
 
+if test "x$build_mac" = "xyes" ; then
+    # Make sure the proper Mac SDK is installed
+    if test ! -d /Developer/SDKs/MacOSX10.5.sdk; then
+      cat << EOF
+You need to install the Mac OS X 10.5 SDK in order to build Transmission
+with --enable-mac:
+  Get your Xcode CD or package
+  Restart the install
+  When it gets to "Installation Type", select "Customize"
+  Select "Mac OS X 10.5 SDK" under "Cross Development"
+  Finish the install.
+EOF
+      exit 1
+    fi
+fi
 if test "x$have_darwin" = "xyes"; then
     AC_DEFINE([HAVE_DARWIN], 1)
 fi
diff --git a/third-party/miniupnp/updateminiupnpcstrings.sh b/third-party/miniupnp/updateminiupnpcstrings.sh
index f9c92dcbc..050c2fa40 100755
--- a/third-party/miniupnp/updateminiupnpcstrings.sh
+++ b/third-party/miniupnp/updateminiupnpcstrings.sh
@@ -13,7 +13,7 @@ if [ -f /etc/debian_version ]; then
 fi
 # use lsb_release (Linux Standard Base) when available
 LSB_RELEASE=`which lsb_release`
-if [ 0 -eq $? ]; then
+if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then
 	OS_NAME=`${LSB_RELEASE} -i -s`
 	OS_VERSION=`${LSB_RELEASE} -r -s`
 	case $OS_NAME in