diff --git a/unzip.changes b/unzip.changes
index d92cd52..288c628 100644
--- a/unzip.changes
+++ b/unzip.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May 07 23:16:45 UTC 2011 - idoenmez@novell.com
+
+- Sync our compile time flags with Debian except Acorn stuff, this enables 
+   UTF-8, saves an unrelated warning about lchmod being not implemented.
+- Enable make check
+
 -------------------------------------------------------------------
 Fri Jan 28 13:50:13 UTC 2011 - lnussel@suse.de
 
diff --git a/unzip.spec b/unzip.spec
index 5596ab3..8f74b50 100644
--- a/unzip.spec
+++ b/unzip.spec
@@ -64,8 +64,16 @@ Authors:
 %patch11
 
 %build
-export RPM_OPT_FLAGS="%optflags -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -fstack-protector -I. -DRCC_LAZY -fno-strict-aliasing"
-make %{?jobs:-j%jobs} -f unix/Makefile LF2=-ldl linux_noasm
+export RPM_OPT_FLAGS="%optflags \
+-D_GNU_SOURCE -DRCC_LAZY -DWILD_STOP_AT_DIR \
+-DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
+-DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD \
+-DDATE_FORMAT=DF_YMD -I. -fstack-protector -fno-strict-aliasing"
+
+make %{?_smp_mflags}  -f unix/Makefile LF2="-ldl" linux_noasm
+
+%check
+make -f unix/Makefile check
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}