diff --git a/.gitignore b/.gitignore
index b5a3ce3..eef3647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /jnr-ffi-2.0.1.zip
 /2.0.2.tar.gz
 /2.0.3.tar.gz
+/2.0.4.tar.gz
diff --git a/MANIFEST.MF b/MANIFEST.MF
deleted file mode 100644
index c29c5cc..0000000
--- a/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: jnr.ffi
-Export-Package: jnr.ffi;version="@VERSION",
- jnr.ffi.annotations;version="@VERSION",
- jnr.ffi.byref;version="@VERSION",
- jnr.ffi.mapper;version="@VERSION",
- jnr.ffi.provider;version="@VERSION",
- jnr.ffi.provider.converters;version="@VERSION",
- jnr.ffi.provider.jffi;version="@VERSION",
- jnr.ffi.provider.jffi.platform.arm.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.i386.darwin;version="@VERSION",
- jnr.ffi.provider.jffi.platform.i386.freebsd;version="@VERSION",
- jnr.ffi.provider.jffi.platform.i386.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.i386.openbsd;version="@VERSION",
- jnr.ffi.provider.jffi.platform.i386.solaris;version="@VERSION",
- jnr.ffi.provider.jffi.platform.i386.windows;version="@VERSION",
- jnr.ffi.provider.jffi.platform.mips.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.mipsel.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.ppc.aix;version="@VERSION",
- jnr.ffi.provider.jffi.platform.ppc.darwin;version="@VERSION",
- jnr.ffi.provider.jffi.platform.ppc.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.s390.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.s390x.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.sparc.solaris;version="@VERSION",
- jnr.ffi.provider.jffi.platform.sparcv9.solaris;version="@VERSION",
- jnr.ffi.provider.jffi.platform.x86_64.darwin;version="@VERSION",
- jnr.ffi.provider.jffi.platform.x86_64.freebsd;version="@VERSION",
- jnr.ffi.provider.jffi.platform.x86_64.linux;version="@VERSION",
- jnr.ffi.provider.jffi.platform.x86_64.openbsd;version="@VERSION",
- jnr.ffi.provider.jffi.platform.x86_64.solaris;version="@VERSION",
- jnr.ffi.provider.jffi.platform.x86_64.windows;version="@VERSION",
- jnr.ffi.types;version="@VERSION",
- jnr.ffi.util;version="@VERSION",
- jnr.ffi.util.ref;version="@VERSION"
-Import-Package: com.kenai.jffi;version="1.2.7",
- jnr.x86asm;version="1.0.2",
- org.objectweb.asm;version="4.0.0",
- org.objectweb.asm.util;version="4.0.0"
-Bundle-Name: Java Abstracted Foreign Function Layer
-Bundle-Version: @VERSION
-Bundle-ManifestVersion: 2
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-Vendor: Eclipse Orbit
-
diff --git a/add-manifest.patch b/add-manifest.patch
deleted file mode 100644
index 96522ff..0000000
--- a/add-manifest.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix	2015-06-17 13:53:28.329374753 -0400
-+++ ./pom.xml	2015-06-17 13:54:25.882334422 -0400
-@@ -127,6 +127,15 @@
-       </plugin>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-jar-plugin</artifactId>
-+        <configuration>
-+          <archive>
-+            <manifestFile>MANIFEST.MF</manifestFile>
-+          </archive>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <version>2.4.2</version>
-         <configuration>
diff --git a/jnr-ffi.spec b/jnr-ffi.spec
index a3d8439..2d46a61 100644
--- a/jnr-ffi.spec
+++ b/jnr-ffi.spec
@@ -1,12 +1,10 @@
 Name:     jnr-ffi
-Version:  2.0.3
-Release:  4%{?dist}
+Version:  2.0.4
+Release:  1%{?dist}
 Summary:  Java Abstracted Foreign Function Layer
 License:  ASL 2.0
 URL:      http://github.com/jnr/%{name}/
 Source0:  https://github.com/jnr/%{name}/archive/%{version}.tar.gz
-Source1:  MANIFEST.MF
-Patch0:   add-manifest.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.github.jnr:jffi)
@@ -38,9 +36,6 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
-cp %{SOURCE1} .
-sed -i -e's/@VERSION/%{version}/g' MANIFEST.MF
-%patch0
 
 # remove all builtin jars
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
@@ -64,6 +59,9 @@ sed -i 's|-Werror||' libtest/GNUmakefile
 %doc LICENSE
 
 %changelog
+* Fri Oct 23 2015 Alexander Kurtakov <akurtako@redhat.com> 2.0.4-1
+- Update to upstream 2.0.4 and drop unneeded osgification patch/source.
+
 * Tue Jun 23 2015 Roland Grunberg <rgrunber@redhat.com> - 2.0.3-4
 - Add missing Import-Package statements to manifest.
 
diff --git a/sources b/sources
index 6a3fa6a..a49f31a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4257b0a8a1b7ffd66f932306d0f56a04  2.0.3.tar.gz
+7630f5005893bac4e16ebceb5639c9de  2.0.4.tar.gz