diff --git a/configure.in b/configure.in
index e2a05db7e..dd9fcb7fb 100644
--- a/configure.in
+++ b/configure.in
@@ -281,14 +281,19 @@ dnl ---------------------------------------------------------------------------
 dnl /proc/meminfo: If the meminfo /proc entry is available, we use it
 dnl to limit the libgphoto2 filesystem cache size.
 dnl ---------------------------------------------------------------------------
-AC_CHECK_FILE(/proc/meminfo, [
-	proc_meminfo_msg="available";
-	proc_meminfo=true;
-	AC_DEFINE(HAVE_PROCMEMINFO,1,[whether we get memory info from /proc/meminfo])
-], [
-	proc_meminfo_msg="not available";
+if test "$cross_compiling" != yes; then
+	AC_CHECK_FILE(/proc/meminfo, [
+		proc_meminfo_msg="available";
+		proc_meminfo=true;
+		AC_DEFINE(HAVE_PROCMEMINFO,1,[whether we get memory info from /proc/meminfo])
+	], [
+		proc_meminfo_msg="not available";
+		proc_meminfo=false;
+	])
+else
+	proc_meminfo_msg="state not known, cross-compilation";
 	proc_meminfo=false;
-])
+fi
 
 dnl Check for sysctl()
 AC_MSG_CHECKING([for sysctl on BSD])
diff --git a/packaging/linux-hotplug/Makefile.am b/packaging/linux-hotplug/Makefile.am
index 8a643d6b0..931babcce 100644
--- a/packaging/linux-hotplug/Makefile.am
+++ b/packaging/linux-hotplug/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES =	\
 noinst_PROGRAMS = print-usb-usermap
 
 # FIXME: This should only be built if target system is linux
+#	 and not cross-compiled.
 print_usb_usermap_SOURCE = print-usb-usermap.c
 print_usb_usermap_LDADD = ../../libgphoto2/libgphoto2.la