diff --git a/ChangeLog b/ChangeLog
index a50f6ac..415553c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-03 Richard Frith-Macdonald  <rfm@gnu.org>
+
+	* GNUmakefile: Add SQLClient_LIBRARIES_DEPEND_UPON for apple as
+	suggested by Yen-Ju Chen.
+	* SQLClient.m: Don't call allocation debug functions on apple,
+	and avoid bogus apple compiler warning.
+
 2005-08-02 Richard Frith-Macdonald  <rfm@gnu.org>
 
 	* GNUmakefile: Don't build WebServer stuff on MacOS-X when using the
diff --git a/GNUmakefile b/GNUmakefile
index 0f588e6..ed20bb0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -31,6 +31,7 @@ endif
 
 ifeq ($(APPLE),1)
 ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
+SQLClient_LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
 else
 SQLClient_OBJC_FILES += WebServer.m WebServerBundles.m
 SQLClient_HEADER_FILES += WebServer.h
diff --git a/SQLClient.m b/SQLClient.m
index c10111f..e4e9f7b 100644
--- a/SQLClient.m
+++ b/SQLClient.m
@@ -134,6 +134,11 @@ inline NSTimeInterval	SQLClientTimeNow()
       DESTROY(ptr[count + pos]);
     }
   NSDeallocateObject(self);
+#ifndef	GNUSTEP
+  // Avoid bogus compiler warning about missing call to super implementation.
+  self = nil;
+  [super dealloc];
+#endif
 }
 
 - (NSMutableDictionary*) dictionary
@@ -1316,9 +1321,13 @@ static void	quoteString(NSMutableString *s)
   if (c != [self class])
     {
       [self disconnect];
+#ifdef	GNUSTEP
       GSDebugAllocationRemove(self->isa, self);
+#endif
       self->isa = c;
+#ifdef	GNUSTEP
       GSDebugAllocationAdd(self->isa, self);
+#endif
     }
 
   s = [d objectForKey: @"Database"];