diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7f9adbfc..9aeb45d0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,9 +4,15 @@ AUTOMAKE_OPTIONS = 1.5 gnits
 # no-dependencies
 
 noinst_LIBRARIES = libfind.a
-noinst_PROGRAMS = regexprops
 
+if CROSS_COMPILING
+# The regexprops program needs to be a native executable, so we 
+# can't build it with a cross-compiler.
+else
+noinst_PROGRAMS = regexprops
 regexprops_SOURCES = regexprops.c regextype.c
+endif
+
 libfind_a_SOURCES =
 EXTRA_DIST = modetype.h wait.h extendbuf.h savedirinfo.h buildcmd.h
 BUILT_SOURCES =
@@ -20,8 +26,6 @@ MAINTAINERCLEANFILES =
 INCLUDES = -I../gnulib/lib -I$(top_srcdir)/gnulib/lib 
 LDADD = ../gnulib/lib/libgnulib.a
 
-INCLUDES = -I$(top_srcdir)/gnulib/lib
-
 libfind_a_SOURCES += modetype.h nextelem.h printquoted.h listfile.h regextype.h
 libfind_a_SOURCES += listfile.c nextelem.c extendbuf.c buildcmd.c savedirinfo.c forcefindlib.c qmark.c printquoted.c regextype.c