diff -uNr bitlbee-0.83~/bitlbee.c bitlbee-0.83/bitlbee.c
--- bitlbee-0.83~/bitlbee.c	Sun Dec 28 16:16:58 2003
+++ bitlbee-0.83/bitlbee.c	Wed Dec 31 01:42:57 2003
@@ -50,7 +50,7 @@
 		memset( &sig, 0, sizeof( sig ) );
 		sig.sa_handler = sighandler;
 		sigaction( SIGPIPE, &sig, &old );
-		sig.sa_flags = SA_ONESHOT;
+		sig.sa_flags = SA_RESETHAND;
 		sigaction( SIGINT,  &sig, &old );
 		sigaction( SIGILL,  &sig, &old );
 		sigaction( SIGBUS,  &sig, &old );
diff -uNr bitlbee-0.83~/configure bitlbee-0.83/configure
--- bitlbee-0.83~/configure	Fri Dec 26 20:38:10 2003
+++ bitlbee-0.83/configure	Wed Dec 31 01:47:10 2003
@@ -290,6 +290,9 @@
 ;;
 Darwin )
 	echo 'Darwin/Mac OS X. This should work well, please read the docs for more information.'
+	if [ "$iconv" = "1" ]; then
+		echo 'EFLAGS+=-liconv' >> Makefile.settings;
+	fi
 ;;
 IRIX )
 	echo 'IRIX should not be a problem. I got some positive testing reports.'
diff -uNr bitlbee-0.83~/protocols/nogaim.c bitlbee-0.83/protocols/nogaim.c
--- bitlbee-0.83~/protocols/nogaim.c	Wed Dec  3 16:49:22 2003
+++ bitlbee-0.83/protocols/nogaim.c	Wed Dec 31 01:43:42 2003
@@ -1019,7 +1019,7 @@
 	iconv_t cd;
 	size_t res;
 	size_t inbytesleft, outbytesleft;
-	char *inbuf = src;
+	const char *inbuf = src;
 	char *outbuf = dst;
 
 	cd = iconv_open(to, from);