diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index 5688a61dd..cac596f5d 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -6,7 +6,7 @@ include ../Version
 include ./Version
 
 ADDITIONAL_INCLUDE_DIRS += -I../SOPE/
-ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
+ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -lbfd
 
 SOGOD     = sogod-$(MAJOR_VERSION).$(MINOR_VERSION)
 TOOL_NAME = $(SOGOD)
diff --git a/Main/NSException+Stacktrace.m b/Main/NSException+Stacktrace.m
index f56046f40..f202598b8 100644
--- a/Main/NSException+Stacktrace.m
+++ b/Main/NSException+Stacktrace.m
@@ -36,6 +36,9 @@
 #include <Foundation/NSProcessInfo.h>
 #include <Foundation/NSThread.h>
 
+#if GNUSTEP_BASE_MAJOR_VERSION >= 1
+#if GNUSTEP_BASE_MINOR_VERSION > 13
+
 //
 //
 //
@@ -65,12 +68,14 @@ _NSFoundationUncaughtExceptionHandler (NSException *exception)
 //
 //
 //
+
 #define	STACKSYMBOLS	1
 
 @interface GSStackTrace : NSObject
 {
   NSMutableArray *frames;
 }
+
 + (GSStackTrace*) currentStack;
 
 - (NSString*) description;
@@ -81,7 +86,7 @@ _NSFoundationUncaughtExceptionHandler (NSException *exception)
 
 @end
 
-#if	defined(STACKSYMBOLS)
+#ifdef STACKSYMBOLS
 
 // GSStackTrace inspired by  FYStackTrace.m
 // created by Wim Oudshoorn on Mon 11-Apr-2006
@@ -538,3 +543,6 @@ GSLoadModule(NSString *fileName)
 }
 
 @end
+
+#endif /* GNUSTEP_BASE_MINOR_VERSION */
+#endif /* GNUSTEP_BASE_MAJOR_VERSION */