diff --git a/flaim/Makefile b/flaim/Makefile
index 5b814e2..3aca1f5 100644
--- a/flaim/Makefile
+++ b/flaim/Makefile
@@ -30,6 +30,10 @@
 #
 #############################################################################
 
+# -- Include --
+
+-include config.in
+
 # -- Project --
 
 project_name = flaim
@@ -111,7 +115,7 @@ ifeq (,$(OSTYPE))
 		HOSTTYPE = $(RPM_OS)
 	endif
 endif
-	
+
 ifndef host_os_family
 	ifneq (,$(findstring Linux,$(OSTYPE)))
 		host_os_family = linux
@@ -137,7 +141,7 @@ ifndef host_os_family
 endif
 
 ifndef host_os_family
-   $(error Host operating system could not be determined)
+   $(error Host operating system could not be determined.  You may need to export HOSTTYPE from the environment.)
 endif
 
 # -- Target build type --
@@ -214,7 +218,7 @@ ifndef target_os_family
 					target_word_size = 32
 				endif
 			else
-				ifneq (,$(findstring i386,$(HOSTTYPE)))
+				ifneq (,$(findstring 86,$(HOSTTYPE)))
 					target_processor = x86
 					target_word_size = 32
 				else
diff --git a/flaim/configure b/flaim/configure
index a9bf588..f766bd8 100755
--- a/flaim/configure
+++ b/flaim/configure
@@ -1 +1,4 @@
 #!/bin/bash
+
+echo OSTYPE = $OSTYPE > config.in
+echo HOSTTYPE = $HOSTTYPE >> config.in