diff --git a/ChangeLog b/ChangeLog
index 88458e6242..8c05ef7cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-23  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/rtsp/Makefile.am:
+	* gst/rtsp/rtspconnection.c: (append_auth_header),
+	(rtsp_connection_send), (rtsp_connection_set_auth):
+	g_base64_encode is a GLib 2.12 function. Use an equivalent taken
+	from icecast to replace it. Relicensed from GPL courtesy of Mike
+	Smith.
+
 2007-02-23  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_finalize),
diff --git a/gst/rtsp/Makefile.am b/gst/rtsp/Makefile.am
index 51bc003ad6..ea0b82c79d 100644
--- a/gst/rtsp/Makefile.am
+++ b/gst/rtsp/Makefile.am
@@ -8,7 +8,8 @@ libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
 			rtspmessage.c		\
 			rtsptransport.c		\
 			rtspurl.c		\
-			sdpmessage.c
+			sdpmessage.c            \
+			base64.c
 
 libgstrtsp_la_CFLAGS = $(GST_CFLAGS)
 libgstrtsp_la_LIBADD = $(GST_LIBS) $(WIN32_LIBS)
@@ -20,4 +21,4 @@ test_SOURCES = test.c rtspdefs.c rtspurl.c rtspconnection.c rtspmessage.c rtsptr
 test_CFLAGS = $(GST_CFLAGS)
 test_LDFLAGS = $(GST_LIBS) $(WIN32_LIBS)
 
-noinst_HEADERS = gstrtspsrc.h gstrtsp.h gstrtpdec.h rtsptransport.h rtsp.h rtspurl.h rtspconnection.h rtspdefs.h rtspmessage.h sdp.h sdpmessage.h rtspextwms.h rtspext.h
+noinst_HEADERS = gstrtspsrc.h gstrtsp.h gstrtpdec.h rtsptransport.h rtsp.h rtspurl.h rtspconnection.h rtspdefs.h rtspmessage.h sdp.h sdpmessage.h rtspextwms.h rtspext.h base64.h
diff --git a/gst/rtsp/rtspconnection.c b/gst/rtsp/rtspconnection.c
index 19f5c6df5a..b3dfba6538 100644
--- a/gst/rtsp/rtspconnection.c
+++ b/gst/rtsp/rtspconnection.c
@@ -69,6 +69,7 @@
 #endif
 
 #include "rtspconnection.h"
+#include "base64.h"
 
 /* the select call is also performed on the control sockets, that way
  * we can send special commands to unlock or restart the select call */
@@ -242,8 +243,7 @@ append_auth_header (RTSPConnection * conn, RTSPMessage * message, GString * str)
     case RTSP_AUTH_BASIC:{
       gchar *user_pass =
           g_strdup_printf ("%s:%s", conn->username, conn->passwd);
-      gchar *user_pass64 =
-          g_base64_encode ((guchar *) user_pass, strlen (user_pass));
+      gchar *user_pass64 = util_base64_encode (user_pass, strlen (user_pass));
       gchar *auth_string = g_strdup_printf ("Basic %s", user_pass64);
 
       append_header (RTSP_HDR_AUTHORIZATION, auth_string, str);