diff --git a/AUTHORS b/AUTHORS
index e2c1154..c9db01b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,19 +1,25 @@
-
 Maintainer:
-	Anas Nashif, Intel Corp.
+	Klaus Kaempf, SUSE, <kkaempf@suse.com>
 
 Developers:
-	Anas Nashif, Intel Corp.
+	Anas Nashif, Intel Corp., <anas.nashif@intel.com>
 	Hou Liang, Intel Corp.
-        Vadim Revyakin, Intel Corp.
-        Denis Sadykov, Intel Corp.
+        Vadim Revyakin, Intel Corp., <vadim.revyakin@intel.com>
+        Denis Sadykov, Intel Corp., <denis.sadykov@intel.com>
 
 Code originally from:
 	Eugene Yarmosh, Intel Corp.
 
 Contributions and Patches by:
-	Viktor Mihajlovski, IBM
-	Klaus Kaempf, Novell
-
+	Jan Blunck, Novell, <jblunck@suse.de>
+	Matthias Bolte <matthias.bolte@googlemail.com>
+	Vitezslav Crhonek, Redhat, <vcrhonek@redhat.com>
+	Klaus Kaempf, Novell, <kkaempf@novell.com>
+	Viktor Mihajlovski, IBM, <MIHAJLOV@de.ibm.com>	
+	Praveen Paladugu, Dell, <Praveen_Paladugu@Dell.com>
+	Chris Poblete, Dell, <Chris_Poblete@Dell.com>
+	Till Steinbach <till.steinbach@informatik.haw-hamburg.de>
+	Suresh Sundriyal, VMware, <ssundriy@vmware.com>
+	Srinivas Thirumalaa
 
 If you think you name should be here and I forgot it, please let me know.
diff --git a/package/openwsman.spec.in b/package/openwsman.spec.in
index c8bcb37..5fa9259 100644
--- a/package/openwsman.spec.in
+++ b/package/openwsman.spec.in
@@ -37,7 +37,6 @@
 %endif
 
 %if 0%{?suse_version} > 0
-
 # No jni_md.h on SLE10 :-/
 #%if 0%{?suse_version} < 1100
 #BuildRequires:  java-1_5_0-ibm-devel
@@ -46,12 +45,12 @@
 #%endif
 
 %if 0%{?suse_version} > 1010
-BuildRequires:  fdupes libopenssl-devel 
-BuildRequires:  libcurl-devel 
+BuildRequires:  fdupes libopenssl-devel
+BuildRequires:  libcurl-devel
 %else
 # SLE10
-BuildRequires:  libidn-devel openssl-devel 
-BuildRequires:  curl-devel 
+BuildRequires:  libidn-devel openssl-devel
+BuildRequires:  curl-devel
 %endif
 
 %if 0%{?suse_version} > 910
@@ -86,16 +85,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Opensource Implementation of WS-Management
+Opensource Implementation of WS-Management protocol stack
 
 
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
-
 %package -n libwsman1
 License:        BSD3c(or similar)
 Group:          System/Management
@@ -104,15 +96,8 @@
 Obsoletes:      openwsman < %{version}
 
 %description -n libwsman1
-Opensource Implementation of WS-Management
-
-
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
+Opensource Implementation of WS-Management protocol stack
+(Common libraries)
 
 %package -n libwsman-devel
 License:        BSD3c(or similar)
@@ -125,15 +110,8 @@
 Requires:       sblim-sfcc-devel libxml2-devel pam-devel
 
 %description -n libwsman-devel
-Opensource Implementation of WS-Management
-
-
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
+Opensource Implementation of WS-Management stack
+(Development files)
 
 %package -n libwsman_clientpp1
 License:        BSD3c(or similar)
@@ -146,13 +124,6 @@
 An implementation of the WsmanClient interface using C++
 
 
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
-
 %package -n libwsman_clientpp-devel
 License:        BSD3c(or similar)
 Group:          System/Management
@@ -164,13 +135,6 @@
 Development files for C++ interface to OpenWSMAN client library.
 
 
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
-
 %package server
 License:        BSD3c(or similar)
 Group:          System/Management
@@ -184,14 +148,6 @@
 Openwsman Server and service libraries
 
 
-
-Authors:
---------
-    Anas Nashif <anas.nashif@intel.com>
-    Vadim Revyakin <vadim.revyakin@intel.com>
-    Denis Sadykov <denis.sadykov@intel.com>
-
-
 %package python
 License:        BSD3c(or similar)
 Group:          Development/Libraries/Python
@@ -206,11 +162,6 @@
 API.
 
 
-
-Authors:
---------
-    Klaus Kaempf <kkaempf@suse.de>
-
 %package ruby
 License:        BSD3c(or similar)
 Group:          System/Management
@@ -231,11 +182,6 @@
 This package provides Ruby bindings to access the openwsman client API.
 
 
-
-Authors:
---------
-    Klaus Kaempf <kkaempf@suse.de>
-
 %package perl
 License:        BSD3c(or similar)
 Group:          System/Management
@@ -250,11 +196,6 @@
 This package provides Perl bindings to access the openwsman client API.
 
 
-
-Authors:
---------
-    Klaus Kaempf <kkaempf@suse.de>
-
 %if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1100
 %package java
 License:        BSD3c(or similar)
@@ -267,10 +208,6 @@
 This package provides Java bindings to access the openwsman client API.
 
 
-
-Authors:
---------
-    Klaus Kaempf <kkaempf@suse.de>
 %endif
 
 %prep
@@ -323,9 +260,6 @@
 install -D -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openwsman
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -n libwsman1 -p /sbin/ldconfig
 
 %postun -n libwsman1 -p /sbin/ldconfig