diff --git a/libidn.changes b/libidn.changes
index 27bcd95..e00b9bb 100644
--- a/libidn.changes
+++ b/libidn.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct  1 01:39:54 UTC 2011 - crrodriguez@opensuse.org
+
+- Do not build gtk-docs 
+- make check hangs in qemu-arm, workaround the bugs.
+
 -------------------------------------------------------------------
 Fri Jun 10 09:20:15 UTC 2011 - andrea.turrini@gmail.com
 
diff --git a/libidn.spec b/libidn.spec
index f02feb8..4c056b9 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -34,7 +34,7 @@ Source0:        http://josefsson.org/libidn/releases/libidn-%version.tar.bz2
 Source1:        baselibs.conf
 PreReq:         %install_info_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  gtk-doc pkgconfig
+BuildRequires:  pkgconfig
 
 %description
 GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA
@@ -89,7 +89,7 @@ Authors:
 %setup -q
 
 %build
-%configure --with-pic --disable-static --enable-gtk-doc
+%configure --with-pic --disable-static --disable-gtk-doc
 %{__make} %{?jobs:-j%jobs}
 
 %install
@@ -99,7 +99,9 @@ rm -f %{buildroot}%{_libdir}/libidn.la
 %find_lang %name
 
 %check
+%if ! 0%{?qemu_user_space_build}
 make check
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -130,6 +132,5 @@ rm -rf $RPM_BUILD_ROOT
 /usr/include/*.h
 %_libdir/pkgconfig/libidn.pc
 %_mandir/man3/*
-/usr/share/gtk-doc/html/libidn
 
 %changelog