diff --git a/ChangeLog b/ChangeLog
index 09ec8001a..a8ef3c1c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-18  Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+
+	* Source/NSObject.m: fix for clang
+	* SSL/GNUmakefile: don't link libobjc ... depend on gnustep-make
+
 2011-06-18  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSURL.h:
diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile
index 97a85ee46..ba86686ca 100644
--- a/SSL/GNUmakefile
+++ b/SSL/GNUmakefile
@@ -73,7 +73,7 @@ SSL_OBJC_FILES = GSSSLHandle.m
 # The principal class in the bundle
 SSL_PRINCIPAL_CLASS = GSSSLHandle
 
-SSL_BUNDLE_LIBS = $(SSLLIBS) -lgnustep-base -lobjc
+SSL_BUNDLE_LIBS = $(SSLLIBS) -lgnustep-base
 
 SSL_NEEDS_GUI = NO
 
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 85d350419..635570062 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -1063,7 +1063,7 @@ objc_create_block_classes_as_subclasses_of(Class super);
       finalize_sel = @selector(finalize);
       finalize_imp = class_getMethodImplementation(self, finalize_sel);
 
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
+#if defined(__FreeBSD__) && defined(__i386__)
       // Manipulate the FPU to add the exception mask. (Fixes SIGFPE
       // problems on *BSD)
       // Note this only works on x86