diff --git a/src/XMPPConnection.h b/src/XMPPConnection.h
index cea874f..fcc9baf 100644
--- a/src/XMPPConnection.h
+++ b/src/XMPPConnection.h
@@ -83,7 +83,7 @@
 @property (copy) OFString *username, *password, *server, *domain, *resource;
 @property (copy, readonly) XMPPJID *JID;
 @property (assign) uint16_t port;
-@property (retain) id <XMPPConnectionDelegate> delegate;
+@property (assign) id <XMPPConnectionDelegate> delegate;
 @property (readonly, retain) XMPPRoster *roster;
 @property (readonly, retain, getter=socket) OFTCPSocket *sock;
 @property (assign) BOOL encryptionRequired;
diff --git a/src/XMPPConnection.m b/src/XMPPConnection.m
index 2b95eb7..ba2d42f 100644
--- a/src/XMPPConnection.m
+++ b/src/XMPPConnection.m
@@ -81,7 +81,6 @@
 	[domain release];
 	[resource release];
 	[JID release];
-	[delegate release];
 	[authModule release];
 	[bindID release];
 	[sessionID release];
@@ -895,14 +894,12 @@
 
 - (void)setDelegate: (id <XMPPConnectionDelegate>)delegate_
 {
-	id old = delegate;
-	delegate = [(id)delegate_ retain];
-	[old release];
+	delegate = (id <XMPPConnectionDelegate, OFObject>)delegate_;
 }
 
 - (id <XMPPConnectionDelegate>)delegate
 {
-	return [[delegate retain] autorelease];
+	return delegate;
 }
 
 - (XMPPRoster*)roster