diff --git a/.gitignore b/.gitignore
index bcce80a..e489731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 jruby-src-1.1.6.tar.gz
 /jruby-src-1.6.2.tar.gz
 /olabini-yecht-0.0.2-0-g157cf13.tar.gz
+/jruby-src-1.6.3.tar.gz
diff --git a/dont-include-jar-dependencies-in-build-xml.patch b/dont-include-jar-dependencies-in-build-xml.patch
index e2930d7..6eccea9 100644
--- a/dont-include-jar-dependencies-in-build-xml.patch
+++ b/dont-include-jar-dependencies-in-build-xml.patch
@@ -1,14 +1,14 @@
---- build.xml.orig	2011-05-25 23:03:44.000000000 -0400
-+++ build.xml	2011-05-25 23:05:08.000000000 -0400
-@@ -343,42 +343,6 @@
+--- build.xml.orig	2011-08-02 06:36:42.000000000 -0400
++++ build.xml	2011-08-02 06:37:31.000000000 -0400
+@@ -331,42 +331,6 @@
    <target name="jar-jruby" depends="init, compile, unzip-native-libs" unless="jar-up-to-date, jar-jruby.hasrun">
        <jar destfile="${lib.dir}/jruby.jar" compress="true" index="true" update="true">
          <fileset dir="${jruby.classes.dir}"/>
 -        <zipfileset src="${asm.jar}"/>
--        <zipfileset src="${asm-commons.jar}"/>
--        <zipfileset src="${asm-util.jar}"/>
--        <zipfileset src="${asm-analysis.jar}"/>
--        <zipfileset src="${asm-tree.jar}"/>
+-        <zipfileset src="${asm.commons.jar}"/>
+-        <zipfileset src="${asm.util.jar}"/>
+-        <zipfileset src="${asm.analysis.jar}"/>
+-        <zipfileset src="${asm.tree.jar}"/>
 -        <zipfileset src="${build.lib.dir}/bytelist.jar"/>
 -        <zipfileset src="${build.lib.dir}/constantine.jar"/>
 -        <zipfileset src="${build.lib.dir}/jline-${jline.version}.jar"/>
@@ -40,28 +40,28 @@
 -        <zipfileset src="${build.lib.dir}/yecht.jar"/>
 -        <zipfileset src="${build.lib.dir}/yydebug.jar"/>
 -        <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-         <metainf dir="${base.dir}/spi">
+         <metainf dir="spi">
            <include name="services/**"/>
          </metainf>
-@@ -417,9 +381,6 @@
+@@ -405,9 +369,6 @@
        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0.jar"/>
        <jarjar destfile="${lib.dir}/jruby-core.jar" compress="true" index="true">
          <fileset dir="${jruby.classes.dir}"/>
 -        <zipfileset src="${asm.jar}"/>
--        <zipfileset src="${asm-util.jar}"/>
+-        <zipfileset src="${asm.util.jar}"/>
 -        <zipfileset src="${build.lib.dir}/yecht.jar"/>
-         <metainf dir="${base.dir}/spi">
+         <metainf dir="spi">
            <include name="services/**"/>
          </metainf>
-@@ -443,42 +404,6 @@
+@@ -431,42 +392,6 @@
        <echo message="jarjaring for dist"/>
        <jarjar destfile="${lib.dir}/jruby.jar" compress="true">
          <fileset dir="${jruby.classes.dir}"/>
 -        <zipfileset src="${asm.jar}"/>
--        <zipfileset src="${asm-commons.jar}"/>
--        <zipfileset src="${asm-util.jar}"/>
--        <zipfileset src="${asm-analysis.jar}"/>
--        <zipfileset src="${asm-tree.jar}"/>
+-        <zipfileset src="${asm.commons.jar}"/>
+-        <zipfileset src="${asm.util.jar}"/>
+-        <zipfileset src="${asm.analysis.jar}"/>
+-        <zipfileset src="${asm.tree.jar}"/>
 -        <zipfileset src="${build.lib.dir}/constantine.jar"/>
 -        <zipfileset src="${build.lib.dir}/bytelist.jar"/>
 -        <zipfileset src="${build.lib.dir}/jline-${jline.version}.jar"/>
@@ -93,18 +93,18 @@
 -        <zipfileset src="${build.lib.dir}/yecht.jar"/>
 -        <zipfileset src="${build.lib.dir}/yydebug.jar"/>
 -        <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-         <metainf dir="${base.dir}/spi">
+         <metainf dir="spi">
            <include name="services/**"/>
          </metainf>
-@@ -601,42 +526,6 @@
+@@ -589,42 +514,6 @@
        <fileset dir="${build.dir}/jar-complete">
          <exclude name="META-INF/jruby.home/lib/ruby/site_ruby/shared/builtin/**"/>
        </fileset>
 -      <zipfileset src="${asm.jar}"/>
--      <zipfileset src="${asm-commons.jar}"/>
--      <zipfileset src="${asm-util.jar}"/>
--      <zipfileset src="${asm-analysis.jar}"/>
--      <zipfileset src="${asm-tree.jar}"/>
+-      <zipfileset src="${asm.commons.jar}"/>
+-      <zipfileset src="${asm.util.jar}"/>
+-      <zipfileset src="${asm.analysis.jar}"/>
+-      <zipfileset src="${asm.tree.jar}"/>
 -      <zipfileset src="${build.lib.dir}/bytelist.jar"/>
 -      <zipfileset src="${build.lib.dir}/constantine.jar"/>
 -      <zipfileset src="${build.lib.dir}/jline-${jline.version}.jar"/>
@@ -136,6 +136,6 @@
 -      <zipfileset src="${build.lib.dir}/yecht.jar"/>
 -      <zipfileset src="${build.lib.dir}/yydebug.jar"/>
 -      <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-       <metainf dir="${base.dir}/spi">
+       <metainf dir="spi">
          <include name="services/**"/>
        </metainf>
diff --git a/jruby.spec b/jruby.spec
index acde5c4..61711cb 100644
--- a/jruby.spec
+++ b/jruby.spec
@@ -3,8 +3,8 @@
 %global yecht_cluster olabini
 
 Name:           jruby
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.6.3
+Release:        1%{?dist}
 Summary:        Pure Java implementation of the Ruby interpreter
 Group:          Development/Languages
 License:        (CPL or GPLv2+ or LGPLv2+) and ASL 1.1 and MIT and Ruby
@@ -15,7 +15,6 @@ Source1:        http://github.com/%{yecht_cluster}/yecht/tarball/0.0.2/%{yecht_c
 Patch1:         add-classpath-to-jruby-start-script.patch
 Patch2:         dont-include-jar-dependencies-in-build-xml.patch
 Patch3:         remove-invoke-dynamic-support.patch
-Patch4:         set-jruby-revision.patch
 Patch5:         jruby-dont-use-jruby-until-build-is-complete.patch
 
 # this patch contains the following upstream change
@@ -34,8 +33,8 @@ BuildRequires:  jline
 BuildRequires:  jcodings >= 1.0.5
 BuildRequires:  joni >= 1.1.2
 BuildRequires:  jna
-BuildRequires:  jaffl >= 0.5.9
-BuildRequires:  jffi >= 1.0.9
+BuildRequires:  jaffl >= 0.5.10
+BuildRequires:  jffi >= 1.0.10
 BuildRequires:  joda-time
 BuildRequires:  yydebug
 BuildRequires:  nailgun
@@ -50,6 +49,7 @@ BuildRequires:  ant-junit
 BuildRequires:  junit4
 BuildRequires:  felix-osgi-core >= 1.4.0
 BuildRequires:  snakeyaml
+BuildRequires:  jnr-posix >= 1.1.8
 
 # these normally get installed as gems during the test process
 BuildRequires:  rubygem(rake)
@@ -65,8 +65,8 @@ Requires:  jline
 Requires:  jcodings >= 1.0.1
 Requires:  joni >= 1.1.2
 Requires:  jna
-Requires:  jaffl >= 0.5.9
-Requires:  jffi >= 1.0.9
+Requires:  jaffl >= 0.5.10
+Requires:  jffi >= 1.0.10
 Requires:  joda-time
 Requires:  yydebug
 Requires:  nailgun
@@ -75,12 +75,7 @@ Requires:  jgrapht
 Requires:  bsf
 Requires:  jnr-netdb
 Requires:  jruby-yecht
-
-# the jna-posix package has been renamed to
-# jnr-posix but the jruby dependency does not
-# yet reflect this
-BuildRequires:  jnr-posix >= 1.1.7
-Requires:  jnr-posix >= 1.1.7
+Requires:  jnr-posix >= 1.1.8
 
 
 %description
@@ -114,7 +109,6 @@ The bindings for the yecht library for internal use in jruby
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
-%patch4 -p0
 %patch5 -p0
 %patch6 -p0
 
@@ -197,7 +191,9 @@ install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}
 
 # jruby-yecht
+install -d -m 755 %{buildroot}%{_javadir}
 cp yecht/lib/yecht-ruby-0.0.2.jar %{buildroot}%{_datadir}/%{name}-yecht.jar
+ln -s %{_datadir}/%{name}-yecht.jar %{buildroot}%{_javadir}/%{name}-yecht.jar
 
 # pom
 %add_to_maven_depmap org.jruby %{name} %{version} JPP %{name}
@@ -232,8 +228,13 @@ ln -s %{_datadir}/%{name}/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
 %files yecht
 %defattr(-,root,root,-)
 %{_datadir}/%{name}-yecht.jar
+%{_javadir}/%{name}-yecht.jar
 
 %changelog
+* Tue Aug 02 2011 Mo Morsi <mmorsi@redhat.com> - 1.6.3-1
+- update to latest upstream release
+- include missing symlink to jruby-yecht
+
 * Wed Jul 06 2011 Mo Morsi <mmorsi@redhat.com> - 1.6.2-2
 - install jruby to _datadir not _javadir
 - remove windows specific files (exes, dlls, etc)
diff --git a/set-jruby-revision.patch b/set-jruby-revision.patch
deleted file mode 100644
index 8ba66d3..0000000
--- a/set-jruby-revision.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- build.xml	2011-05-25 23:23:33.000000000 -0400
-+++ build.xml.orig	2011-05-25 23:23:11.000000000 -0400
-@@ -192,8 +192,8 @@
-     <attribute name="tzdata-version" default="${tzdata.distributed.version}"/>
-     <sequential>
-       <echo message="Updating constants with tzdata version @{tzdata-version}"/>
--        <exec osfamily="unix" executable="git" outputproperty="jruby.revision" failonerror="false" failifexecutionfails="false">
--          <arg line="log -1 --format=format:%h"/>
-+        <exec osfamily="unix" executable="echo" outputproperty="jruby.revision" failonerror="false" failifexecutionfails="false">
-+          <arg line="1.6.2"/>
-         </exec>
-         <exec osfamily="windows" executable="cmd" outputproperty="jruby.revision" failonerror="false" failifexecutionfails="false">
-           <arg line="/c git log -1 --format=format:%h"/>
diff --git a/sources b/sources
index 963da9b..4e7ad68 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-906f66dcd744bf24c43c2b3ce0c68dc2  jruby-src-1.6.2.tar.gz
+0fc5d433a485375eba6192f2ee78a457  jruby-src-1.6.3.tar.gz
 964d857ee91eb2a64c8cf174e109fb1d  olabini-yecht-0.0.2-0-g157cf13.tar.gz