diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/glame
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.36 2007/07/15 19:14:07 drac Exp $
+  10 Mar 2009; Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+  glame-2.0.1.ebuild, +files/glame-2.0.1-guile18.patch
+  Fixed glame's guile compat code to support guile-1.8.5
 
   15 Jul 2007; Samuli Suominen <drac@gentoo.org> glame-2.0.1.ebuild:
   Add built_with_use check for bug 164514, missing quotes, and more.
diff --git a/media-sound/glame/Manifest b/media-sound/glame/Manifest
--- a/media-sound/glame/Manifest
+++ b/media-sound/glame/Manifest
@@ -1,5 +1,6 @@
 AUX glame-2.0.1-cflags.patch 612 RMD160 a51101e272177a6f69cf2ed718cd6612d265605f SHA1 40e67ee9ce9ec4ebee8931188c0b75f5736615de SHA256 295e0c385b906b73afedaf7344cea001e93fb66293bb719178d41669f303189e
+AUX glame-2.0.1-guile18.patch 405 RMD160 bf8326f3423ef396a0498c31db1549babe9ff807 SHA1 e2ffd9a2ce78a0b2551ca89a41f2df56e686bda2 SHA256 aabea1429b92b183cbaa216a6c62482b1ed627ac7b1ed40686921a22bc891c1b
 DIST glame-2.0.1.tar.gz 1662524 RMD160 0f8d0034140dad9df52f81bbf95b9be565dcb038 SHA1 a012ca9b6133825fa956b95bea06b17db34ae954 SHA256 c1106fc540bd28c88fedce8f0e386115c387e92fe1e06480ffcdf7f3d067bb3c
-EBUILD glame-2.0.1.ebuild 1819 RMD160 91d3d63a3739b053a2e0b93fe89dd75bb314c8ea SHA1 73177c65a1fa115658961280a0aa4ed30bf487f1 SHA256 017010c03ca9363860a03cf9b6891c34edc375b765521d0541f197d2d833ca18
-MISC ChangeLog 4881 RMD160 db9648b5d9a260c28450a00a598a71260aee7b5e SHA1 1d0060335296d35d163bc4002306d97f7fe27416 SHA256 30a71e580ef099bf06a85b9f1953dbeeaa38a37647f319faf303f0de72fc0b24
+EBUILD glame-2.0.1.ebuild 1860 RMD160 14eba2324dbe6586d123d7cc897835b5fcd776bd SHA1 1262d278e2f4ae66d29ab099d7a08f65397453e3 SHA256 3965c059e22712a9ce883c308df13cd2e6a61dcf210d4147251183bacb958fbf
+MISC ChangeLog 5060 RMD160 582ac1f961f16a4f3457dc9dfdd2d2fdd5708a23 SHA1 c6fac147fcc1507dcd47cc3b50629cbb1c9ba522 SHA256 4c1ca6460d5be9eac431ffb4cbf69df6f82c2c58d2ad115a9766094f3d3af965
 MISC metadata.xml 266 RMD160 bb37b82779d56773b2f9d18b1bf189ddae5ddeef SHA1 872ec1dfabe1b7f8e47a0c326fb45b7b9b6c55c7 SHA256 c8553fccce2e1b4be4940e2f93a90e4cf7682b5157783af61aae38874f7287f0
diff --git a/media-sound/glame/files/glame-2.0.1-guile18.patch b/media-sound/glame/files/glame-2.0.1-guile18.patch
new file mode 100644
--- /dev/null
+++ b/media-sound/glame/files/glame-2.0.1-guile18.patch
@@ -0,0 +1,12 @@
+--- glame-2.0.1/src/include/glame_guile_compat.h	Sat Oct 23 09:09:27 2004
++++ glame-2.0.1/src/include/glame_guile_compat.h	Tue Mar 10 18:49:36 2009
+@@ -47,7 +47,7 @@
+ #define glame_scm2double(obj) scm_num2dbl (obj, "somewhere")
+ #define scm_str2string(str) gh_str02scm (str)
+ 
+-#if (SCM_MINOR_VERSION == 7)
++#if (SCM_MINOR_VERSION > 6)
+ #define GLAME_NEWCELL(z) z = scm_cell (SCM_UNPACK(z), 0)
+ #endif
+ 
+
diff --git a/media-sound/glame/glame-2.0.1.ebuild b/media-sound/glame/glame-2.0.1.ebuild
--- a/media-sound/glame/glame-2.0.1.ebuild
+++ b/media-sound/glame/glame-2.0.1.ebuild
@@ -43,6 +43,7 @@ src_unpack() {
 	eautoconf
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-guile18.patch
 	sed -i -e 's:glame.png:glame-logo.jpg:' src/gui/glame.desktop
 }