diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index a1264cd8cc26..92fe6af1388b 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	frodo
 PORTVERSION=	4.1b
+PORTREVISION=	1
 CATEGORIES=	emulators tk84
 MASTER_SITES=	http://iphcip1.physik.uni-mainz.de/~cbauer/
 DISTNAME=	FrodoV4_1b.Src
@@ -22,13 +23,21 @@ WRKNAME=	Frodo-4.1b
 WRKSRC=		${WRKDIR}/${WRKNAME}/Src
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
+USE_REINPLACE=	yes
+.if !defined(WITHOUT_SDL)
+USE_SDL=	yes
+.endif
 
 ROM=		1541 Basic Char Kernal
 
+
 post-patch:
-	@${MV} ${WRKDIR}/${WRKNAME}/TkGui.tcl ${WRKDIR}/${WRKNAME}/TkGui.tcl.sed
-	${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		${WRKDIR}/${WRKNAME}/TkGui.tcl.sed > ${WRKDIR}/${WRKNAME}/TkGui.tcl
+	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+		${WRKDIR}/${WRKNAME}/TkGui.tcl
+.if !defined(WITHOUT_SDL)
+	${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g" \
+		${WRKSRC}/configure
+.endif
 
 do-install:
 	${SED} -e 's=\$${PREFIX}=${PREFIX}=g' \
diff --git a/emulators/frodo/files/patch-Display_SDL.i b/emulators/frodo/files/patch-Display_SDL.i
new file mode 100644
index 000000000000..7beeb88748a0
--- /dev/null
+++ b/emulators/frodo/files/patch-Display_SDL.i
@@ -0,0 +1,11 @@
+--- Display_SDL.i.orig	Wed Jan  2 22:42:42 2002
++++ Display_SDL.i	Sat Sep  6 07:54:35 2003
+@@ -213,7 +213,7 @@
+  *  LED error blink
+  */
+ 
+-void C64Display::pulse_handler(...)
++void C64Display::pulse_handler(int dummy)
+ {
+ 	for (int i=0; i<4; i++)
+ 		switch (c64_disp->led_state[i]) {