diff --git a/jna.spec b/jna.spec
index 06e1cc4..d801d09 100644
--- a/jna.spec
+++ b/jna.spec
@@ -16,6 +16,10 @@ Source0:        %{name}-%{version}.svn630.tar.bz2
 Patch1:         jna-3.0.2-loadlibrary.patch
 # Will send upstream...
 Patch2:         jna-3.0.4-nomixedjar.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=84
+Patch3:         jna-3.0.4-callbacks-typemappers.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=XXX
+Patch4:         jna-3.0.4-callbacks-methodname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -47,6 +51,8 @@ This package contains the javadocs for %{name}.
 %setup -q -n %{name}-%{version}-svn630
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
@@ -103,6 +109,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 04 2008 Colin Walters <walters@redhat.com> - 3.0.4-2.svn630
+- Add two (sent upstream) patches that I need for JGIR
+
 * Thu Jul 31 2008 Colin Walters <walters@redhat.com> - 3.0.4-1.svn630
 - New upstream version, drop upstreamed patch parts
 - New patch jna-3.0.4-nomixedjar.patch which ensures that we don't