diff --git a/hamcrest-core-MANIFEST.MF b/hamcrest-core-MANIFEST.MF
new file mode 100644
index 0000000..cc730c5
--- /dev/null
+++ b/hamcrest-core-MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.hamcrest.core
+Export-Package: org.hamcrest;version="1.1.0";core=split;mandatory:=cor
+ e,org.hamcrest.core;version="1.1.0",org.hamcrest.internal;version="1.
+ 1.0";x-internal:=true
+Bundle-Version: 1.1.0.v20090501071000
+Bundle-ManifestVersion: 2
diff --git a/hamcrest.spec b/hamcrest.spec
index d35191e..6f49fe9 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -53,7 +53,7 @@
 
 Name:           hamcrest
 Version:        1.1
-Release:        9.1%{?dist}
+Release:        9.2%{?dist}
 Epoch:          0
 Summary:        Library of matchers for building test expressions
 License:        BSD
@@ -67,6 +67,7 @@ Source4:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-generator/1.
 Source5:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
 Source6:        http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.pom
 Source7:        hamcrest-text-1.1.pom
+Source8:        hamcrest-core-MANIFEST.MF
 Patch0:         hamcrest-1.1-build.patch
 Patch1:         hamcrest-1.1-no-jarjar.patch
 Patch2:         hamcrest-1.1-no-integration.patch
@@ -115,6 +116,7 @@ UI validation rules.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+BuildArch:      noarch
 
 %description javadoc
 Javadoc for %{name}.
@@ -133,7 +135,7 @@ Requires:       testng
 Demonstrations and samples for %{name}.
 
 %prep
-%setup -q 
+%setup -q
 find . -type f -name "*.jar" | xargs -t rm
 # BUILD/hamcrest-%{version}/lib/generator/jarjar-1.0rc3.jar.no
 %if %with jarjar
@@ -176,6 +178,12 @@ ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=first
 ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=first clean core generator library text bigjar javadoc
 %endif
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/%{name}-core-%{version}.jar META-INF/MANIFEST.MF
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
@@ -233,7 +241,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
-%endif 
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -297,6 +305,10 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-9.2
+- Add OSGi manifest for hamcrest-core.
+- Make javadoc package noarch.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-9.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -396,10 +408,10 @@ fi
 * Fri Sep 06 2002 Henri Gomez <hgomez@users.sourceforge.net> 3.8.1-1jpp
 - 3.8.1
 
-* Sun Sep 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.8-2jpp 
+* Sun Sep 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.8-2jpp
 - used original zip file
 
-* Thu Aug 29 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.8-1jpp 
+* Thu Aug 29 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.8-1jpp
 - 3.8
 - group, vendor and distribution tags