diff --git a/.cvsignore b/.cvsignore
index db86f41..2638a6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-empathy-0.22.1.tar.bz2
+empathy-0.23.1.tar.bz2
diff --git a/empathy.spec b/empathy.spec
index 58df2da..a29df82 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -4,13 +4,12 @@
 ## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control,
 ## respectively.
 %global	gtk2_min_version	2.12
-%global	glib2_min_version	2.14
-%global	tp_mc_min_version	4.53
-%global	libtp_min_version	0.3.1
-%global	tp_glib_min_version	0.7.3		
+%global	glib2_min_version	2.15.5
+%global	tp_mc_min_version	4.61
+%global	tp_glib_min_version	0.7.6		
 
 Name:		empathy
-Version:	0.22.1
+Version:	0.23.1
 Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
@@ -27,16 +26,17 @@ BuildRequires:	evolution-data-server-devel
 BuildRequires:	GConf2-devel 
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
+BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	gnome-panel-devel
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
 BuildRequires:	libglade2-devel
-BuildRequires:	libtelepathy-devel >= %{libtp_min_version}
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
-BuildRequires:	pygtk2-devel	
-BuildRequires:	telepathy-glib >= %{tp_glib_min_version}
+BuildRequires:	pygtk2-devel
+BuildRequires:	scrollkeeper	
+BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
 BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 
 Requires:	%{name}-libs = %{version}-%{release}
@@ -72,6 +72,7 @@ Requires:	pkgconfig
 ## Needs these for the various #include directives in its headers, as well
 ## as pkgconfig dependencies...
 Requires:	glib2-devel >= %{glib2_min_version}
+Requires:	telepathy-glib-devel >= %{tp_glib_min_version}
 Requires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 Requires:	libxml2-devel
 
@@ -85,7 +86,7 @@ Summary:	Shared libraries for %{name}
 Group:		Development/Libraries
 Requires:	glib2 >= %{glib2_min_version}
 Requires:	gtk2 >= %{gtk2_min_version}
-Requires:	libtelepathy >= %{libtp_min_version}
+Requires:	telepathy-glib >= %{tp_glib_min_version}
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
 %description	libs
@@ -117,12 +118,9 @@ install -m 0644 %{SOURCE1} ./README.ConnectionManagers
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-## Remove --no-connect from the .desktop file; without this empathy won't
-## launch from the menu.
-sed -i 's/--no-connect//' %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
 desktop-file-install --vendor fedora --delete-original	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	%{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -177,9 +175,10 @@ fi
 %{_bindir}/empathy
 %{_bindir}/empathy-accounts
 %{_bindir}/empathy-logs
-%{_datadir}/dbus-1/services/org.gnome.Empathy.Chat.service
 %{_datadir}/empathy/
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/gnome/help/%{name}/
+%{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 ## Support for these are through Haze, and it (telepathy-haze-mission-control
 ## package) provides its own profiles with greater "out of the box"
@@ -192,18 +191,17 @@ fi
 %{_datadir}/mission-control/profiles/ekiga.profile
 %{_datadir}/mission-control/profiles/fwd.profile
 %{_datadir}/mission-control/profiles/gtalk.profile
+%{_datadir}/mission-control/profiles/groupwise.profile
 %{_datadir}/mission-control/profiles/irc.profile
 %{_datadir}/mission-control/profiles/jabber.profile
 %{_datadir}/mission-control/profiles/msn.profile
 %{_datadir}/mission-control/profiles/salut.profile
 %{_datadir}/mission-control/profiles/sofiasip.profile
 %{_datadir}/mission-control/profiles/sipphone.profile
-%{_datadir}/telepathy/managers/empathy-chat.chandler
-%{_datadir}/telepathy/managers/empathy-call.chandler
 %{_libexecdir}/megaphone-applet
-%{_libexecdir}/empathy-call-chandler
+%{_libexecdir}/nothere-applet
 %{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_datadir}/dbus-1/services/org.gnome.Empathy.Call.service
+%{_libdir}/bonobo/servers/GNOME_NotHere_Applet.server
 
 %files	libs
 %defattr(-,root,root,-)
@@ -229,6 +227,10 @@ fi
 
 
 %changelog
+* Wed Apr 23 2008 Peter Gordon <peter@thecodergeek.com> - 0.23.1-1
+- Update to new upstream release (0.23.1)
+- Drop libtelepathy dependencies; upstream switched fully to telepathy-glib.
+
 * Fri Apr 11 2008 Peter Gordon <peter@thecodergeek.com> - 0.22.1-1
 - Update to new upstream release (0.22.1)
 
diff --git a/sources b/sources
index 2d26b34..fcdaa90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8045104e4aff6559f81c13c37b22c9e  empathy-0.22.1.tar.bz2
+8ed7511804b1e0d77416843dc66d99c7  empathy-0.23.1.tar.bz2