diff --git a/configure.ac b/configure.ac
index f6abe908..a6c65ab5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,7 @@ lib/python/Makefile
 lib/threadframe/Makefile
 services/Makefile
 services/presence/Makefile
+services/presence2/Makefile
 services/nm/Makefile
 services/clipboard/Makefile
 services/datastore/Makefile
diff --git a/services/Makefile.am b/services/Makefile.am
index ceb990c6..7dbbc87e 100644
--- a/services/Makefile.am
+++ b/services/Makefile.am
@@ -1 +1 @@
-SUBDIRS = presence nm clipboard datastore console
+SUBDIRS = presence presence2 nm clipboard datastore console
diff --git a/services/presence2/Makefile.am b/services/presence2/Makefile.am
new file mode 100644
index 00000000..fa22b191
--- /dev/null
+++ b/services/presence2/Makefile.am
@@ -0,0 +1,7 @@
+sugardir = $(pkgdatadir)/services/presence2
+sugar_PYTHON = \
+	__init__.py
+
+bin_SCRIPTS = sugar-presence-service2
+
+EXTRA_DIST = $(bin_SCRIPTS)
diff --git a/services/presence2/__init__.py b/services/presence2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/services/presence2/sugar-presence-service2 b/services/presence2/sugar-presence-service2
new file mode 100755
index 00000000..1c1fe700
--- /dev/null
+++ b/services/presence2/sugar-presence-service2
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# vi: ts=4 ai noet 
+#
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import logging
+import sys
+import os
+
+from sugar import logger
+from sugar import env
+
+sys.path.insert(0, env.get_services_dir())
+
+logger.start('presenceservice')
+
+from presence2 import PresenceService
+
+logging.info('Starting presence service')
+
+PresenceService.main()