diff --git a/xorgxrdp.changes b/xorgxrdp.changes
index 9ddb976..5695fc2 100644
--- a/xorgxrdp.changes
+++ b/xorgxrdp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  4 05:20:53 UTC 2017 - fezhang@suse.com
+
+- exclude s390x arch
+- specfile cleanup
+
 -------------------------------------------------------------------
 Wed Aug 16 05:23:06 UTC 2017 - ftake@geeko.jp
 
diff --git a/xorgxrdp.spec b/xorgxrdp.spec
index 42d2ab4..b4f90ca 100644
--- a/xorgxrdp.spec
+++ b/xorgxrdp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorgxrdp
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,30 +15,31 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xorgxrdp
 Version:        0.2.3
 Release:        0
-License:        X11
 Summary:        Xorg drivers for xrdp
-Url:            https://github.com/neutrinolabs/xorgxrdp
+License:        X11
 Group:          System/X11/Utilities
+Url:            https://github.com/neutrinolabs/xorgxrdp
 Source0:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  nasm
 BuildRequires:  libtool
+BuildRequires:  nasm
+BuildRequires:  xorg-x11-server-sdk
+BuildRequires:  xrdp-devel
+Requires:       xrdp >= 0.9.1
 # For 42.x keep to use libXfont-devel
 %if 0%{?suse_version} > 1320
 BuildRequires:  libXfont2-devel
 %else
 BuildRequires:  libXfont-devel
 %endif
-BuildRequires:  xorg-x11-server-sdk
-BuildRequires:  xrdp-devel
-Requires:       xrdp >= 0.9.1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExcludeArch:    s390x
 
 %description
 This package contains Xorg driver modules for xrdp
@@ -52,11 +53,10 @@ sh ./bootstrap
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} %{?_smp_mflags}
-find %{buildroot}/%{_libdir} -name "*.la" -type f -delete -print
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %files
-%defattr(-,root,root)
 %doc README.md COPYING
 %{_libdir}/xorg/modules/drivers/xrdpdev_drv.so
 %dir %{_libdir}/xorg/modules/input