diff --git a/jsch.spec b/jsch.spec
index 8e0f5c7..0de90d3 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -30,12 +30,13 @@
 
 Name:           jsch
 Version:        0.1.51
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.jcraft.com/jsch/
+BuildArch:      noarch
+
 Source0:        http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip
 # wget \
 # http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/com.jcraft.jsch_0.1.41.v200903070017.jar
@@ -56,8 +57,6 @@ BuildRequires:  jzlib >= 0:1.0.5
 BuildRequires:  ant
 BuildRequires:  zip
 
-BuildArch:      noarch
-
 Requires:       jzlib >= 0:1.0.5
 
 %description
@@ -67,19 +66,16 @@ functionality into your own Java programs.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
 
 %description    javadoc
 %{summary}.
 
 %package        demo
 Summary:        Examples for %{name}
-Group:          Documentation
 
 %description    demo
 %{summary}.
 
-
 %prep
 %setup -q
 
@@ -113,22 +109,22 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap
 
-%files
-%{_javadir}/*.jar
+%files -f .mfiles
 %doc LICENSE.txt
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%doc %{_javadocdir}/%{name}*
+%doc %{_javadocdir}/%{name}
 %doc LICENSE.txt
 
 %files demo
-%doc %{_datadir}/%{name}*
+%doc %{_datadir}/%{name}-%{version}
 %doc LICENSE.txt
 
 
 %changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.1.51-2
+- Update to current packaging guidelines
+
 * Tue Mar 18 2014 Alexander Kurtakov <akurtako@redhat.com> 0:0.1.51-1
 - Update to latest upstream 0.1.51.