diff --git a/MANIFEST.MF b/MANIFEST.MF
new file mode 100644
index 0000000..2149c56
--- /dev/null
+++ b/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-SymbolicName: com.jcraft.jsch
+Bundle-Version: 0.1.51
+Bundle-Vendor: %venderName
+Bundle-Localization: plugin
+Export-Package: com.jcraft.jsch;version="0.1.51",
+ com.jcraft.jsch.jce;version="0.1.51";x-internal:=true,
+ com.jcraft.jsch.jcraft;version="0.1.51";x-internal:=true,
+ com.jcraft.jsch.jgss;version="0.1.51";x-internal:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Created-By: 1.4.0 (Sun Microsystems Inc.)
+
+
diff --git a/jsch-0.1.50.zip b/jsch-0.1.50.zip
deleted file mode 100644
index fb16bf4..0000000
--- a/jsch-0.1.50.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:443cea6e5a019580b62f66357b707c1939598855566646d536a83be5828f6c6d
-size 333297
diff --git a/jsch-0.1.51.pom b/jsch-0.1.51.pom
new file mode 100644
index 0000000..2f7e962
--- /dev/null
+++ b/jsch-0.1.51.pom
@@ -0,0 +1,111 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.jcraft</groupId>
+  <artifactId>jsch</artifactId>
+  <packaging>jar</packaging>
+  <version>0.1.51</version>
+  <name>JSch</name>
+  <url>http://www.jcraft.com/jsch/</url>
+  <description>JSch is a pure Java implementation of SSH2</description>
+  <organization>
+    <name>JCraft,Inc.</name>
+    <url>http://www.jcraft.com/</url>
+  </organization>
+  <scm>
+    <connection>scm:git:http://git.jcraft.com/jsch.git</connection>
+    <developerConnection>scm:git:http://git.jcraft.com/jsch.git</developerConnection>
+    <url>http://git.jcraft.com/jsch.git</url>
+  </scm>
+  <developers>
+    <developer>
+    <id>ymnk</id>
+    <name>Atsuhiko Yamanaka</name>
+    <email>ymnk at jcraft D0t com</email>
+    <url>http://github.com/ymnk</url>
+    <organization>JCraft,Inc.</organization>
+    <organizationUrl>http://www.jcraft.com/</organizationUrl>
+    <roles>
+      <role>architect</role>
+      <role>developer</role>
+    </roles>
+    <timezone>+9</timezone>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>Revised BSD</name>
+      <url>http://www.jcraft.com/jsch/LICENSE.txt</url>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jzlib</artifactId>
+      <version>1.0.7</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+         <artifactId>wagon-ssh-external</artifactId>
+         <version>1.0-alpha-5</version>
+      </extension>
+    </extensions>
+  </build>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>6</version>
+  </parent>
+</project>
diff --git a/jsch-0.1.51.zip b/jsch-0.1.51.zip
new file mode 100644
index 0000000..5d54d80
--- /dev/null
+++ b/jsch-0.1.51.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c031b863fbbfe861c5365e8cf403b24b2eb5b40d1c112a048a73f87b5e828c30
+size 339393
diff --git a/jsch.changes b/jsch.changes
index 8da19fa..1ea34f8 100644
--- a/jsch.changes
+++ b/jsch.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 17 15:49:57 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 0.1.51
+- Cleanup with spec-cleaner
+- Add maven and osgi things same as in Fedora.
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:06 UTC 2013 - tchvatal@suse.com
 
diff --git a/jsch.spec b/jsch.spec
index 1140ad6..337ef0c 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jsch
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,32 +16,32 @@
 #
 
 
-%define section   free
-
 Name:           jsch
-Version:        0.1.50
+Version:        0.1.51
 Release:        0
 Summary:        Pure Java implementation of SSH2
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 Url:            http://www.jcraft.com/jsch/
-Source0:        http://downloads.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip
-Requires:       jzlib
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip
+Source1:        MANIFEST.MF
+Source2:        plugin.properties
+Source3:        http://repo1.maven.org/maven2/com/jcraft/%{name}/%{version}/%{name}-%{version}.pom
 BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
 BuildRequires:  jzlib
 BuildRequires:  unzip
-BuildArch:      noarch
+BuildRequires:  zip
+Requires:       jzlib
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 JSch allows you to connect to an sshd server and use port forwarding,
 X11 forwarding, file transfer, etc., and you can integrate its
 functionality into your own Java programs.
 
-
-
 %package        javadoc
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -51,8 +51,6 @@ JSch allows you to connect to an sshd server and use port forwarding,
 X11 forwarding, file transfer, etc., and you can integrate its
 functionality into your own Java programs.
 
-
-
 %package        demo
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -62,36 +60,46 @@ JSch allows you to connect to an sshd server and use port forwarding,
 X11 forwarding, file transfer, etc., and you can integrate its
 functionality into your own Java programs.
 
-
-
 %prep
 %setup -q
 
 %build
 export CLASSPATH=$(build-classpath jzlib)
-export OPT_JAR_LIST=:
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 dist javadoc 
+ant dist javadoc
 
 %install
+# inject the OSGi Manifest
+mkdir META-INF
+cp %{SOURCE1} META-INF
+cp %{SOURCE2} plugin.properties
+zip dist/lib/%{name}-*.jar META-INF/MANIFEST.MF
+zip dist/lib/%{name}-*.jar plugin.properties
+
 # jars
 install -Dpm 644 dist/lib/%{name}-*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+
 # examples
 install -dm 755 %{buildroot}%{_datadir}/%{name}
 cp -pr examples/* %{buildroot}%{_datadir}/%{name}
 
-%clean
-rm -rf %{buildroot}
+# POM and depmap
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%config %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
diff --git a/plugin.properties b/plugin.properties
new file mode 100644
index 0000000..175e422
--- /dev/null
+++ b/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Atsuhiko Yamanaka, JCraft,Inc. - initial API and implementation.
+#     IBM Corporation - implementation
+###############################################################################
+venderName=JCraft, Inc.
+bundleName=JSch