diff --git a/include/ChangeLog b/include/ChangeLog
index 04e7697e..757f8683 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-29  Marcel Telka  <marcel@telka.sk>
+
+	* configure.ac: Simplified support for Hitachi Workbench/IAR Compiler.
+
 2005-06-28  Marcel Telka  <marcel@telka.sk>
 
 	* configure.ac (AC_INIT): Changed version number to 0.4.
diff --git a/include/NEWS b/include/NEWS
index f2946c1c..5039f118 100644
--- a/include/NEWS
+++ b/include/NEWS
@@ -9,10 +9,10 @@ include-0.4:
 	* Added more manufacturer entries into Manufacturer's Identification Code database.
 	* Changes in stdint.h support:
 		- Ported uintptr_t type to old Windows SDK (win32)
-		- Added stdint.h support for Hitachi Workbench (hwbench)
+		- Added stdint.h support for Hitachi Workbench/IAR Compiler (hwbench)
 	* Changes in brux common headers:
 		- Added new parameter (adr) for detectflash function
-	* Added support for Hitachi Workbench.
+	* Added support for Hitachi Workbench/IAR Compiler.
 
 include-0.3.2 (2003-10-11):
 
diff --git a/include/README b/include/README
index 296fc7df..94290878 100644
--- a/include/README
+++ b/include/README
@@ -23,8 +23,8 @@ Installation instructions
 4. Run `make install`.
 
 
-Notes for Hitachi Workbench users
----------------------------------
+Notes for Hitachi Workbench/IAR Compiler users
+----------------------------------------------
 
 You should use following parameters for the ./configure script:
 	--with-hwbench=PATH_TO_HWBENCH --host=hwbench
diff --git a/include/configure.ac b/include/configure.ac
index 3947bb24..448d5374 100644
--- a/include/configure.ac
+++ b/include/configure.ac
@@ -55,20 +55,22 @@ AC_CACHE_CHECK([for hwbench installation], hwbench_path, [
 	for hwb_path in "$with_hwbench"; do
 		if test -f "$hwb_path/IAR/EXE/ICCH83.EXE"; then
 			hwbench_path="$hwb_path"
-			export CC="$hwb_path/IAR/EXE/ICCH83.EXE -I`cygpath -w \"$hwb_path/IAR/INC/\"|sed -e 's/\\\\/\\\\\\\\/g'`"
-			export CPP=/usr/bin/cpp
+			CC="$hwb_path/IAR/EXE/ICCH83.EXE"
+			CPPFLAGS="-I`cygpath -w \"$hwb_path/IAR/INC/\"|sed -e 's/\\\\/\\\\\\\\/g'`"
 			break
 		fi
 	done
 ])
 
+AC_PROG_CC
+
 generate_stdint_h="no"
-AC_CHECK_HEADERS( stdint.h, [], [
-		if test "$hwbench_path" = "no"; then
+if test "$hwbench_path" = "no"; then
+	AC_CHECK_HEADERS( stdint.h, [], [
 			AX_CREATE_STDINT_H( owce-stdint.h )
 			generate_stdint_h="yes"
-		fi
-])
+	])
+fi
 AM_CONDITIONAL( GENERATE_STDINT_H, test "$generate_stdint_h" = "yes" )
 AM_CONDITIONAL( HAVE_HWBENCH, test "$hwbench_path" != "no" )
 HWBENCH_PATH="$hwbench_path"