diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile
index ff120f814cee..95c01953204d 100644
--- a/emulators/dynamips-devel/Makefile
+++ b/emulators/dynamips-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dynamips
-DISTVERSION=	0.2.7-RC2
+DISTVERSION=	0.2.7-RC3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ipflow.utc.fr/dynamips/
 PKGNAMESUFFIX=	-devel
@@ -34,6 +34,24 @@ MAN1=		${PORTNAME}.1 nvram_export.1
 MAN7=		hypervisor_mode.7
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+DYNAMIPS_ARCH=	"x86"
+.elif ${ARCH} == "amd64"
+DYNAMIPS_ARCH=	"amd64"
+.else
+DYNAMIPS_ARCH=	"nojit"
+.endif
+
+.if ${OSVERSION} < 602100 || ${OSVERSION} < 700021
+BUILD_DEPENDS+=	libpcap>=0.9.4:${PORTSDIR}/net/libpcap
+.endif
+
+.if ${OSVERSION} >= 700013
+MAKE_ENV+=	HAS_POSIX_MEMALIGN=1
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/nvram_export ${PREFIX}/bin
@@ -48,24 +66,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/hypervisor_mode.7 ${PREFIX}/man/man7
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-DYNAMIPS_ARCH=	"x86"
-.elif ${ARCH} == "amd64"
-DYNAMIPS_ARCH=	"amd64"
-.else
-DYNAMIPS_ARCH=	"nojit"
-.endif
-
-.if ${OSVERSION} < 602100 || ${OSVERSION} < 700021
-#
-# Requires libpcap 0.9.4
-BUILD_DEPENDS+=	libpcap>=0.9.4:${PORTSDIR}/net/libpcap
-.endif
-
-.if ${OSVERSION} >= 700013
-MAKE_ENV+=	HAS_POSIX_MEMALIGN=1
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/emulators/dynamips-devel/distinfo b/emulators/dynamips-devel/distinfo
index 3281ac99da97..eb9f57eadc9e 100644
--- a/emulators/dynamips-devel/distinfo
+++ b/emulators/dynamips-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (dynamips-0.2.7-RC2.tar.gz) = 91cfb0587df58611765ae06c147c678a
-SHA256 (dynamips-0.2.7-RC2.tar.gz) = 9ce1ed6d49e9483ffda146e9d8decb5ded2bc545fc5fabddce124d86e8487598
-SIZE (dynamips-0.2.7-RC2.tar.gz) = 509298
+MD5 (dynamips-0.2.7-RC3.tar.gz) = 9d1d5ab929fda30ea3b4b8d9284edc70
+SHA256 (dynamips-0.2.7-RC3.tar.gz) = cd1d23fa0122bcec70a4028ce60ae100fbe3d7a599f1bbb1f30f34faa35546c1
+SIZE (dynamips-0.2.7-RC3.tar.gz) = 522645
diff --git a/emulators/dynamips-devel/files/patch-nvram_export.1 b/emulators/dynamips-devel/files/patch-nvram_export.1
new file mode 100644
index 000000000000..477b8b7e65d1
--- /dev/null
+++ b/emulators/dynamips-devel/files/patch-nvram_export.1
@@ -0,0 +1,11 @@
+--- nvram_export.1.orig	Thu May  3 12:46:51 2007
++++ nvram_export.1	Thu May  3 12:47:10 2007
+@@ -13,7 +13,7 @@
+ Please send bug reports to http://www.ipflow.utc.fr/bts/
+ .SH SEE ALSO
+ .br
+-\fBdynmips\fP(1), \fBhypervisor_mode\fP(7)
++\fBdynamips\fP(1), \fBhypervisor_mode\fP(7)
+ .br
+ .UR
+ http://www.ipflow.utc.fr/index.php/