diff --git a/java/kaffe-devel/Makefile b/java/kaffe-devel/Makefile
index a81d98274e77..0ce149af6544 100644
--- a/java/kaffe-devel/Makefile
+++ b/java/kaffe-devel/Makefile
@@ -12,7 +12,7 @@
 # KAFFE_AWT = QT        Qt AWT classes
 
 PORTNAME=	kaffe
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.3
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 PKGNAMESUFFIX=	-devel
@@ -23,9 +23,10 @@ COMMENT=	Multi-platform Java virtual machine with JIT compiler and AWT package
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		gmp.6:${PORTSDIR}/math/libgmp4
 
-WRKSRC=         ${WRKDIR}/kaffe-${PORTVERSION}
+WRKSRC=		${WRKDIR}/kaffe-${PORTVERSION}
 
 NOT_FOR_ARCHS=	amd64
 
@@ -34,7 +35,7 @@ USE_GMAKE=	yes
 LIBTOOLFLAGS=
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-iconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE}
 
 .if defined(KAFFE_AWT)
 .if ${KAFFE_AWT} == "X"
diff --git a/java/kaffe-devel/distinfo b/java/kaffe-devel/distinfo
index b3dceb6f6653..47a09170539e 100644
--- a/java/kaffe-devel/distinfo
+++ b/java/kaffe-devel/distinfo
@@ -1 +1 @@
-MD5 (kaffe-1.1.0.tar.gz) = b761b506bfb1d0995f4dd20abba9e24f
+MD5 (kaffe-1.1.3.tar.gz) = 2563e002e554b1c1644cb84cc3eaba74
diff --git a/java/kaffe-devel/files/patch-config::i386::freebsd2::md.h b/java/kaffe-devel/files/patch-config::i386::freebsd2::md.h
deleted file mode 100644
index 6cff34cc34ba..000000000000
--- a/java/kaffe-devel/files/patch-config::i386::freebsd2::md.h
+++ /dev/null
@@ -1,12 +0,0 @@
- --- config/i386/freebsd2/md.h.orig	Sat Sep  6 01:38:48 2003
- +++ config/i386/freebsd2/md.h	Sat Sep  6 01:38:52 2003
- @@ -39,8 +39,8 @@
-  	asm("frstor %0": :"m"(*fdata))
-  
-  /* Define signal context macros for xprofiling */
- -#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *##sc
- -#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *##scp
- +#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *sc
- +#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp
-  #define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
-  #define SIGNAL_PC(scp) (scp)->sc_pc
diff --git a/java/kaffe-devel/files/patch-inetaddressimpl b/java/kaffe-devel/files/patch-inetaddressimpl
new file mode 100644
index 000000000000..7a4017a9f808
--- /dev/null
+++ b/java/kaffe-devel/files/patch-inetaddressimpl
@@ -0,0 +1,12 @@
+--- libraries/clib/net/InetAddressImpl.c.orig	Wed Dec 31 13:43:03 2003
++++ libraries/clib/net/InetAddressImpl.c	Wed Dec 31 13:43:09 2003
+@@ -241,7 +241,9 @@
+ 			   "Unable to contact name server");
+       break;
+     case EAI_NONAME:
++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+     case EAI_NODATA:
++#endif
+       postExceptionMessage(&einfo,
+ 			   JAVA_NET(UnknownHostException),
+ 			   "Unknown host: %s",
diff --git a/java/kaffe-devel/pkg-plist b/java/kaffe-devel/pkg-plist
index 9f0b41d50e5f..e9912ed990ad 100644
--- a/java/kaffe-devel/pkg-plist
+++ b/java/kaffe-devel/pkg-plist
@@ -16,53 +16,55 @@ bin/native2ascii
 bin/rmic
 bin/rmiregistry
 bin/serialver
-include/kaffe/Arrays.h
-include/kaffe/errors.h
 include/kaffe/java_lang_Object.h
+include/kaffe/java_lang_StackTraceElement.h
 include/kaffe/java_lang_String.h
 include/kaffe/java_lang_Thread.h
 include/kaffe/java_lang_ThreadGroup.h
 include/kaffe/java_lang_Throwable.h
+include/kaffe/java_lang_VMThrowable.h
 include/kaffe/jmalloc.h
-include/kaffe/jni_cpp.h
-include/kaffe/jsyscall.h
 include/kaffe/jtypes.h
-include/kaffe/native.h
 include/jni.h
-jre/bin/kaffe-bin
+include/jni_cpp.h
+include/jvmpi.h
 jre/bin/java
 jre/bin/kaffe
+jre/bin/kaffe-bin
 jre/bin/rmiregistry
 jre/lib/%%ARCH%%/libawt-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libawt.so
 jre/lib/%%ARCH%%/libawt.la
+jre/lib/%%ARCH%%/libawt.so
 jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libio.so
 jre/lib/%%ARCH%%/libio.la
+jre/lib/%%ARCH%%/libio.so
 jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libkaffevm.so
 jre/lib/%%ARCH%%/libkaffevm.la
+jre/lib/%%ARCH%%/libkaffevm.so
 jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmanagement.la
+jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libmath.so
 jre/lib/%%ARCH%%/libmath.la
+jre/lib/%%ARCH%%/libmath.so
 jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnative.so
 jre/lib/%%ARCH%%/libnative.la
+jre/lib/%%ARCH%%/libnative.so
 jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libnet.so
 jre/lib/%%ARCH%%/libnet.la
+jre/lib/%%ARCH%%/libnet.so
+jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libnio.la
+jre/lib/%%ARCH%%/libnio.so
 jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libsecurity.so
 jre/lib/%%ARCH%%/libsecurity.la
-jre/lib/%%ARCH%%/libtritonuscommon-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libtritonuscommon.so
-jre/lib/%%ARCH%%/libtritonuscommon.la
+jre/lib/%%ARCH%%/libsecurity.so
 jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libzip.so
 jre/lib/%%ARCH%%/libzip.la
+jre/lib/%%ARCH%%/libzip.so
+jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libtritonusesd.la
+jre/lib/%%ARCH%%/libtritonusesd.so
 jre/lib/security/java.security
 jre/lib/rt.jar
 lib/kjc.jar