diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 15a43b22e81d..dce9a3892c88 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rkward
 DISTVERSION=	0.4.9a
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,8 +18,6 @@ COMMENT=	IDE/GUI for the R-project
 
 LIB_DEPENDS=	R.0:${PORTSDIR}/math/R
 
-BROKEN=		does not compile
-
 USE_KDELIBS_VER=3
 USE_PHP=	yes
 WANT_PHP_CLI=	yes
@@ -31,8 +29,7 @@ CONFIGURE_ARGS=	--disable-fast-perl
 INSTALLS_ICONS=	yes
 
 USE_FORTRAN=	yes
-FORTRANLIBDIR2=	`${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
-CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/rkward
 
diff --git a/math/rkward-kde4/files/patch-rkward_rbackend_rembedinternal.cpp b/math/rkward-kde4/files/patch-rkward_rbackend_rembedinternal.cpp
new file mode 100644
index 000000000000..ff283dc0187d
--- /dev/null
+++ b/math/rkward-kde4/files/patch-rkward_rbackend_rembedinternal.cpp
@@ -0,0 +1,13 @@
+--- ./rkward/rbackend/rembedinternal.cpp.orig	2008-04-10 15:19:08.000000000 +0200
++++ ./rkward/rbackend/rembedinternal.cpp	2009-01-21 10:27:25.000000000 +0100
+@@ -87,7 +87,9 @@
+ #include "R.h"
+ #include "Rinternals.h"
+ #include "Rinterface.h"
+-#include "Rdevices.h"
++#if (R_VERSION < R_Version(2, 8, 1))
++# include "Rdevices.h"
++#endif
+ #include "R_ext/Parse.h"
+ 
+ #ifdef R_2_4
diff --git a/math/rkward-kde4/pkg-plist b/math/rkward-kde4/pkg-plist
index 1e738269a06c..f90076f3c115 100644
--- a/math/rkward-kde4/pkg-plist
+++ b/math/rkward-kde4/pkg-plist
@@ -472,21 +472,23 @@ share/icons/locolor/32x32/apps/rkward.png
 @dirrmtry share/apps/katepart/syntax
 @dirrmtry share/apps/katepart
 @cwd %%LOCALBASE%%
+lib/R/library/rkward/CONTENTS
 lib/R/library/rkward/DESCRIPTION
-lib/R/library/rkward/Meta/package.rds
+lib/R/library/rkward/INDEX
 lib/R/library/rkward/Meta/Rd.rds
 lib/R/library/rkward/Meta/hsearch.rds
-lib/R/library/rkward/libs/rkward.so
+lib/R/library/rkward/Meta/package.rds
+lib/R/library/rkward/R-ex/public.R
 lib/R/library/rkward/R/rkward
-lib/R/library/rkward/man/rkward.Rd.gz
+lib/R/library/rkward/R/rkward.rdb
+lib/R/library/rkward/R/rkward.rdx
 lib/R/library/rkward/help/AnIndex
 lib/R/library/rkward/help/public
 lib/R/library/rkward/html/00Index.html
 lib/R/library/rkward/html/public.html
 lib/R/library/rkward/latex/public.tex
-lib/R/library/rkward/R-ex/public.R
-lib/R/library/rkward/CONTENTS
-lib/R/library/rkward/INDEX
+lib/R/library/rkward/libs/rkward.so
+lib/R/library/rkward/man/rkward.Rd.gz
 @dirrm lib/R/library/rkward/man
 @dirrm lib/R/library/rkward/libs
 @dirrm lib/R/library/rkward/latex
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 15a43b22e81d..dce9a3892c88 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rkward
 DISTVERSION=	0.4.9a
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,8 +18,6 @@ COMMENT=	IDE/GUI for the R-project
 
 LIB_DEPENDS=	R.0:${PORTSDIR}/math/R
 
-BROKEN=		does not compile
-
 USE_KDELIBS_VER=3
 USE_PHP=	yes
 WANT_PHP_CLI=	yes
@@ -31,8 +29,7 @@ CONFIGURE_ARGS=	--disable-fast-perl
 INSTALLS_ICONS=	yes
 
 USE_FORTRAN=	yes
-FORTRANLIBDIR2=	`${DIRNAME} \\`gfortran42 -print-libgcc-file-name\\``/../../../
-CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
+FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/rkward
 
diff --git a/math/rkward/files/patch-rkward_rbackend_rembedinternal.cpp b/math/rkward/files/patch-rkward_rbackend_rembedinternal.cpp
new file mode 100644
index 000000000000..ff283dc0187d
--- /dev/null
+++ b/math/rkward/files/patch-rkward_rbackend_rembedinternal.cpp
@@ -0,0 +1,13 @@
+--- ./rkward/rbackend/rembedinternal.cpp.orig	2008-04-10 15:19:08.000000000 +0200
++++ ./rkward/rbackend/rembedinternal.cpp	2009-01-21 10:27:25.000000000 +0100
+@@ -87,7 +87,9 @@
+ #include "R.h"
+ #include "Rinternals.h"
+ #include "Rinterface.h"
+-#include "Rdevices.h"
++#if (R_VERSION < R_Version(2, 8, 1))
++# include "Rdevices.h"
++#endif
+ #include "R_ext/Parse.h"
+ 
+ #ifdef R_2_4
diff --git a/math/rkward/pkg-plist b/math/rkward/pkg-plist
index 1e738269a06c..f90076f3c115 100644
--- a/math/rkward/pkg-plist
+++ b/math/rkward/pkg-plist
@@ -472,21 +472,23 @@ share/icons/locolor/32x32/apps/rkward.png
 @dirrmtry share/apps/katepart/syntax
 @dirrmtry share/apps/katepart
 @cwd %%LOCALBASE%%
+lib/R/library/rkward/CONTENTS
 lib/R/library/rkward/DESCRIPTION
-lib/R/library/rkward/Meta/package.rds
+lib/R/library/rkward/INDEX
 lib/R/library/rkward/Meta/Rd.rds
 lib/R/library/rkward/Meta/hsearch.rds
-lib/R/library/rkward/libs/rkward.so
+lib/R/library/rkward/Meta/package.rds
+lib/R/library/rkward/R-ex/public.R
 lib/R/library/rkward/R/rkward
-lib/R/library/rkward/man/rkward.Rd.gz
+lib/R/library/rkward/R/rkward.rdb
+lib/R/library/rkward/R/rkward.rdx
 lib/R/library/rkward/help/AnIndex
 lib/R/library/rkward/help/public
 lib/R/library/rkward/html/00Index.html
 lib/R/library/rkward/html/public.html
 lib/R/library/rkward/latex/public.tex
-lib/R/library/rkward/R-ex/public.R
-lib/R/library/rkward/CONTENTS
-lib/R/library/rkward/INDEX
+lib/R/library/rkward/libs/rkward.so
+lib/R/library/rkward/man/rkward.Rd.gz
 @dirrm lib/R/library/rkward/man
 @dirrm lib/R/library/rkward/libs
 @dirrm lib/R/library/rkward/latex