diff --git a/kbd.changes b/kbd.changes
index 285d68a..17d27b3 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 30 15:28:41 UTC 2011 - uli@suse.com
+
+- cross-build fix: use %__cc, %configure macros
+- configure: explicitly set bindir
+
 -------------------------------------------------------------------
 Wed Sep 14 15:58:43 CEST 2011 - sbrabec@suse.cz
 
diff --git a/kbd.spec b/kbd.spec
index ef36586..7ce6026 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -101,15 +101,16 @@ pushd data/keymaps/i386
 	# bnc#435121
 	test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
 popd
-./configure \
+%configure \
 	--prefix=/ \
 	--datadir=%{kbd} \
 	--mandir=%{_mandir} \
+	--bindir=/bin \
 	--enable-nls \
 	--localedir=/usr/share/locale \
 	--enable-optional-progs
 make CFLAGS="$RPM_OPT_FLAGS -Os"
-gcc $RPM_OPT_FLAGS -o fbtest   $RPM_SOURCE_DIR/fbtest.c
+%{__cc} $RPM_OPT_FLAGS -o fbtest   $RPM_SOURCE_DIR/fbtest.c
 # fix lat2-16.psfu (bnc#340579)
 font=data/consolefonts/lat2a-16.psfu
 ./src/psfxtable -i $font -it  data/unimaps/lat2u.uni \