diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch
new file mode 100644
--- /dev/null
+++ b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-08-11 16:55:09.246939884 +0200
++++ Makefile.in	2010-08-11 16:55:31.309819842 +0200
+@@ -853,7 +853,7 @@
+ cig/libcig.c:		cig/libcig.scm
+ 
+ scsh/scsh: scsh/scsh-tramp.c
+-	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) \
++	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+ 	-DVM=\"$(LIB)/$(VM)\" \
+ 	-DIMAGE=\"$(LIB)/scsh.image\" \
+ 	$(srcdir)/scsh/scsh-tramp.c
diff --git a/app-shells/scsh/files/0.6.7-Missing-includes.patch b/app-shells/scsh/files/0.6.7-Missing-includes.patch
new file mode 100644
--- /dev/null
+++ b/app-shells/scsh/files/0.6.7-Missing-includes.patch
@@ -0,0 +1,22 @@
+diff -r 3dd93fcbca44 c/unix/dynamo.c
+--- a/c/unix/dynamo.c	Wed Aug 11 17:02:46 2010 +0200
++++ b/c/unix/dynamo.c	Wed Aug 11 17:04:34 2010 +0200
+@@ -5,6 +5,7 @@
+ 
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include "sysdep.h"
+ #include "scheme48.h"
+ 
+diff -r 3dd93fcbca44 c/unix/socket.c
+--- a/c/unix/socket.c	Wed Aug 11 17:02:46 2010 +0200
++++ b/c/unix/socket.c	Wed Aug 11 17:04:34 2010 +0200
+@@ -8,6 +8,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/param.h>
++#include <malloc.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netdb.h>
diff --git a/app-shells/scsh/scsh-0.6.7.ebuild b/app-shells/scsh/scsh-0.6.7-r1.ebuild
rename from app-shells/scsh/scsh-0.6.7.ebuild
rename to app-shells/scsh/scsh-0.6.7-r1.ebuild
--- a/app-shells/scsh/scsh-0.6.7.ebuild
+++ b/app-shells/scsh/scsh-0.6.7-r1.ebuild
@@ -22,6 +22,8 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch"
+	epatch "${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PV}-Missing-includes.patch"
 }
 
 src_configure() {