diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index f2bc0f5dd03c..de066cfae8db 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xscavenger
-# Date created:		19 Feb 1998
-# Whom:			eivind
-#
+# Created by: eivind
 # $FreeBSD$
-#
 
 PORTNAME=	xscavenger
 PORTVERSION=	1.4.4
@@ -13,14 +9,16 @@ MASTER_SITES=	http://www.xdr.com/dash/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Lode Runner clone for X11
+COMMENT=	Lode Runner clone for X11
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC_SUBDIR=	src
 
 USE_IMAKE=	yes
 USE_XORG=	x11 xext
 MAN6=		scavenger.6
 
+CFLAGS+=	-Wno-return-type -Wno-pointer-sign
+
 pre-configure:
 	@${LN} -sf scavenger.6 ${WRKSRC}/scavenger.man
 	@${ECHO_CMD} "MANSUFFIX=6" >> ${WRKSRC}/Imakefile
diff --git a/games/xscavenger/files/patch-edit.c b/games/xscavenger/files/patch-edit.c
new file mode 100644
index 000000000000..1806b82b14b7
--- /dev/null
+++ b/games/xscavenger/files/patch-edit.c
@@ -0,0 +1,10 @@
+--- edit.c.orig	2013-06-11 18:21:01.902812410 +0400
++++ edit.c	2013-06-11 18:21:15.931811652 +0400
+@@ -2,6 +2,7 @@
+ 
+ #include <stdio.h>
+ #include <unistd.h>
++#include <string.h>
+ #include "scav.h"
+ #include "edit.h"
+ #include "x.h"