diff --git a/channels/Makefile b/channels/Makefile
index 4ebfada2d6..8f0640c9c3 100755
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -16,12 +16,18 @@ OSARCH=$(shell uname -s)
 USE_MYSQL_FRIENDS=0
 USE_SIP_MYSQL_FRIENDS=0
 
-CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
+CHANNEL_LIBS=chan_modem.so chan_sip.so \
 	     chan_modem_aopen.so \
              chan_modem_bestdata.so chan_modem_i4l.so \
              chan_agent.so chan_mgcp.so chan_iax2.so \
 	     chan_local.so chan_skinny.so
 
+#
+# If you really want IAX1 uncomment the following, but it is
+# unmaintained
+#
+#CHANNEL_LIBS+=chan_iax.so
+
 #
 # If you really want VoFR you can have it :-P
 #
@@ -160,6 +166,7 @@ chan_h323.so: chan_h323.o h323/libchanh323.a
 
 install: all
 	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 
 depend: .depend
 
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 14f5689b7d..5bc06b0937 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2625,7 +2625,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p, struct ast_rtp *
 	char a2[1024] = "";
 	int x;
 	struct sockaddr_in dest;
-	struct sockaddr_in vdest;
+	struct sockaddr_in vdest = { 0, };
 	/* XXX We break with the "recommendation" and send our IP, in order that our
 	       peer doesn't have to gethostbyname() us XXX */
 	len = 0;
@@ -3696,7 +3696,7 @@ static int check_auth(struct sip_pvt *p, struct sip_request *req, char *randdata
 		char a1_hash[256];
 		char a2_hash[256];
 		char resp[256];
-		char resp_hash[256];
+		char resp_hash[256]="";
 		char tmp[256] = "";
 		char *c;
 		char *z;