Fork from Ubuntu's libappindicator project.

73 files changed, 366 insertions, 315 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index 6c96a98..0000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-split = True
diff --git a/Makefile.am b/Makefile.am
index b76dff5..c0a42d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = \
-      src		\
+	  src		\
 	  bindings	\
 	  docs
 
@@ -21,32 +21,60 @@ EXTRA_DIST = \
 	COPYING.LGPL.2.1 \
 	ChangeLog
 
+DISTCLEANFILES = \
+	INSTALL \
+	Makefile.in \
+	aclocal.m4 \
+	ar-lib \
+	autom4te.cache/ \
+	compile \
+	config.guess \
+	config.h.in \
+	config.h.in~ \
+	config.sub \
+	configure \
+	depcomp \
+	gtk-doc.make \
+	install-sh \
+	ltmain.sh \
+	m4/gtk-doc.m4 \
+	m4/libtool.m4 \
+	m4/ltoptions.m4 \
+	m4/ltsugar.m4 \
+	m4/ltversion.m4 \
+	m4/lt~obsolete.m4 \
+	missing \
+	omf.make \
+	py-compile \
+	test-driver \
+	xmldocs.make
+
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall --enable-introspection
 
 dist-hook:
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating ChangeLog && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
-				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-				|| (rm -f ChangeLog.tmp; \
-					echo Failed to generate ChangeLog >&2 ); \
-        else \
-			echo Failed to generate ChangeLog: not a branch >&2; \
+	@if test -d "$(top_srcdir)/.git"; \
+	    then \
+	        echo Creating ChangeLog && \
+	        ( cd "$(top_srcdir)" && \
+	        echo '# Generated by Makefile. Do not edit.'; echo; \
+	        $(top_srcdir)/missing --run git --no-pager log --since "1970" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n") > ChangeLog.tmp \
+	        && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+	        || (rm -f ChangeLog.tmp; \
+	            echo Failed to generate ChangeLog >&2 ); \
+	else \
+	    echo Failed to generate ChangeLog: not a branch >&2; \
 	fi
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating AUTHORS && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
-				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
-				|| (rm -f AUTHORS.tmp; \
-					echo Failed to generate AUTHORS >&2 ); \
-        else \
-			echo Failed to generate AUTHORS: not a branch >&2; \
+	@if test -d "$(top_srcdir)/.git"; \
+	    then \
+	        echo Creating AUTHORS && \
+	            ( cd "$(top_srcdir)" && \
+	            echo '# Generated by Makefile. Do not edit.'; echo; \
+	            $(top_srcdir)/missing --run  git log | grep -e "^Author:" -e "Committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+	            && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+	            || (rm -f AUTHORS.tmp; \
+	                echo Failed to generate AUTHORS >&2 ); \
+	    else \
+	        echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
 include $(top_srcdir)/Makefile.am.coverage
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index d1f6d73..d2a1ac5 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -10,3 +10,5 @@ endif
 if HAS_MONO
 SUBDIRS += mono
 endif
+
+DISTCLEANFILES = Makefile.in
\ No newline at end of file
diff --git a/bindings/mono/ApplicationIndicator.custom b/bindings/mono/ApplicationIndicator.custom
index fcc52d7..4992c08 100644
--- a/bindings/mono/ApplicationIndicator.custom
+++ b/bindings/mono/ApplicationIndicator.custom
@@ -1,16 +1,16 @@
-[DllImport ("appindicator.dll")]
+[DllImport ("ayatana-appindicator.dll")]
 static extern int app_indicator_get_status (IntPtr i);
 
-[DllImport ("appindicator.dll")]
+[DllImport ("ayatana-appindicator.dll")]
 static extern int app_indicator_get_category (IntPtr i);
 
-[DllImport ("appindicator.dll")]
+[DllImport ("ayatana-appindicator.dll")]
 static extern void app_indicator_set_status (IntPtr i, int s);
 
         [GLib.Property ("status")]
-        public Status Status {
+        public AppIndicatorStatus AppIndicatorStatus {
                get {
-                   return (Status) app_indicator_get_status (Handle);
+                   return (AppIndicatorStatus) app_indicator_get_status (Handle);
                }
 
                set {
@@ -19,8 +19,8 @@ static extern void app_indicator_set_status (IntPtr i, int s);
         }
 
         [GLib.Property ("category")]
-        public Category Category {
+        public AppIndicatorCategory AppIndicatorCategory {
                get {
-                   return (Category) app_indicator_get_category (Handle);
+                   return (AppIndicatorCategory) app_indicator_get_category (Handle);
                }
         }
diff --git a/bindings/mono/AssemblyInfo.cs b/bindings/mono/AssemblyInfo.cs
index 0417db6..4b3e671 100644
--- a/bindings/mono/AssemblyInfo.cs
+++ b/bindings/mono/AssemblyInfo.cs
@@ -20,11 +20,11 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle ("Application Indicators")]
-[assembly: AssemblyDescription ("Ubuntu Application Indicators")]
+[assembly: AssemblyDescription ("Ayatana Application Indicators")]
 [assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("Canonical, Ltd.")]
-[assembly: AssemblyProduct ("Ubuntu")]
-[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")]
+[assembly: AssemblyCompany ("Ayatana Project")]
+[assembly: AssemblyProduct ("Ayatana AppIndicators")]
+[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.; © 2015 Mike Gabriel")]
 [assembly: AssemblyTrademark ("")]
 [assembly: AssemblyCulture ("")]
-[assembly: AssemblyVersion ("0.2")]
+[assembly: AssemblyVersion ("0.5.0.0")]
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 6f8e8a9..2424a62 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -1,18 +1,18 @@
 SUBDIRS = . examples
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = appindicator-sharp-0.1.pc
+pkgconfig_DATA = ayatana-appindicator-sharp-0.1.pc
 
 if BUILD_MONO_TEST
-TEST = AppIndicator.Test.dll
+TEST = AyatanaAppIndicator.Test.dll
 endif
 
-API = libappindicator-api.xml
-MIDDLE_API = libappindicator-api.middle
-RAW_API = libappindicator-api.raw
-METADATA = libappindicator-api.metadata
-ASSEMBLY_NAME = appindicator-sharp
-ASSEMBLY_VERSION = 0.2.0.0
+API = libayatana-appindicator-api.xml
+MIDDLE_API = libayatana-appindicator-api.middle
+RAW_API = libayatana-appindicator-api.raw
+METADATA = libayatana-appindicator-api.metadata
+ASSEMBLY_NAME = ayatana-appindicator-sharp
+ASSEMBLY_VERSION = 0.5.0.0
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME)
 POLICY_VERSION = 0.0
@@ -31,7 +31,7 @@ TARGET = \
 	$(DLLPOLICY1) \
 	$(POLICY1).config
 
-assemblydir = $(libdir)/cli/appindicator-sharp-0.1
+assemblydir = $(libdir)/cli/ayatana-appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
 
 CLEANFILES = \
@@ -55,7 +55,7 @@ endif
 DISTCLEANFILES = $(ASSEMBLY).config
 
 if BUILD_MONO_TEST
-TEST_SOURCES = TestIndicator.cs
+TEST_SOURCES = TestAyatanaIndicator.cs
 endif
 
 customs = ApplicationIndicator.custom
@@ -64,8 +64,8 @@ EXTRA_DIST =					\
 	AssemblyInfo.cs \
 	$(RAW_API)				\
 	$(METADATA)				\
-	appindicator-sharp-0.1.pc.in		\
-	appindicator-sharp.dll.config.in	\
+	ayatana-appindicator-sharp-0.1.pc.in		\
+	ayatana-appindicator-sharp.dll.config.in	\
 	app-indicator.sources.xml.in		\
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
@@ -173,3 +173,5 @@ $(POLICY1).config: $(POLICY1).config.in Makefile
 
 $(DLLPOLICY1): $(POLICY1).config $(ASSEMBLY_NAME).snk Makefile
 	$(AL) -link:$(POLICY1).config -out:$(DLLPOLICY1) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk
+
+DISTCLEANFILES += Makefile.in
diff --git a/bindings/mono/TestIndicator.cs b/bindings/mono/TestAyatanaIndicator.cs
index 3127342..61fc53c 100644
--- a/bindings/mono/TestIndicator.cs
+++ b/bindings/mono/TestAyatanaIndicator.cs
@@ -20,11 +20,11 @@
 using System;
 using GLib;
 using Gtk;
-using AppIndicator;
+using AyatanaAppIndicator;
 
 using NUnit.Framework;
 
-namespace Ayatana.AppIndicator.Test
+namespace Ayatana.AyatanaAppIndicator.Test
 {
         [TestFixture]
         public class IndicatorTest
@@ -44,7 +44,7 @@ namespace Ayatana.AppIndicator.Test
 
                         Console.WriteLine ("Init()");
 
-                        indicator = new ApplicationIndicator ("my-id", "my-name", Category.ApplicationStatus);
+                        indicator = new ApplicationIndicator ("my-id", "my-name", AppIndicatorCategory.ApplicationStatus);
 
                         Console.WriteLine ("Created indicator");
 
@@ -60,7 +60,7 @@ namespace Ayatana.AppIndicator.Test
 
                         Assert.AreEqual (indicator.IconName, "my-name");
                         Assert.AreEqual (indicator.ID, "my-id");
-                        Assert.AreEqual (indicator.Status, Category.ApplicationStatus);
+                        Assert.AreEqual (indicator.AppIndicatorStatus, AppIndicatorCategory.ApplicationStatus);
 
                         Console.WriteLine ("End..");
                 }
@@ -70,10 +70,10 @@ namespace Ayatana.AppIndicator.Test
                 {
                         Console.WriteLine ("TestSetProperties");
 
-                        indicator.Status = Status.Attention;
+                        indicator.AppIndicatorStatus = AppIndicatorStatus.Attention;
                         indicator.AttentionIconName = "my-attention-name";
 
-                        Assert.AreEqual (indicator.Status, Status.Attention);
+                        Assert.AreEqual (indicator.AppIndicatorStatus, AppIndicatorStatus.Attention);
                         Assert.AreEqual (indicator.AttentionIconName, "my-attention-name");
 
                         Console.WriteLine ("End..");
diff --git a/bindings/mono/app-indicator.sources.xml.in b/bindings/mono/app-indicator.sources.xml.in
index 7f8e869..9a283ea 100644
--- a/bindings/mono/app-indicator.sources.xml.in
+++ b/bindings/mono/app-indicator.sources.xml.in
@@ -1,7 +1,7 @@
 <gapi-parser-input>
-	<api filename="libappindicator-api.raw">
-		<library name="appindicator.dll">
-			<namespace name="AppIndicator">
+	<api filename="libayatana-appindicator-api.raw">
+		<library name="ayatana-appindicator.dll">
+			<namespace name="AyatanaAppIndicator">
 				<file>@top_builddir@/bindings/mono/app-indicator.c</file>
 				<file>@top_builddir@/src/app-indicator-enum-types.c</file>
 				<file>@top_builddir@/src/app-indicator-enum-types.h</file>
diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in
deleted file mode 100644
index f63c01e..0000000
--- a/bindings/mono/appindicator-sharp-0.1.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
-
-Name: appindicator-sharp
-Description: application indicators for .NET
-Version: @VERSION@
-Libraries: ${assemblies_dir}/appindicator-sharp.dll ${assemblies_dir}/appindicator-sharp.dll.config
-Requires: gtk-sharp-2.0
-Cflags:
-Libs: -r:${assemblies_dir}/appindicator-sharp.dll
diff --git a/bindings/mono/ayatana-appindicator-sharp-0.1.pc.in b/bindings/mono/ayatana-appindicator-sharp-0.1.pc.in
new file mode 100644
index 0000000..6c091ed
--- /dev/null
+++ b/bindings/mono/ayatana-appindicator-sharp-0.1.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+assemblies_dir=${prefix}/lib/cli/ayatana-appindicator-sharp-0.1
+
+Name: ayatana-appindicator-sharp
+Description: application indicators for .NET
+Version: @VERSION@
+Libraries: ${assemblies_dir}/ayatana-appindicator-sharp.dll ${assemblies_dir}/ayatana-appindicator-sharp.dll.config
+Requires: gtk-sharp-2.0
+Cflags:
+Libs: -r:${assemblies_dir}/ayatana-appindicator-sharp.dll
diff --git a/bindings/mono/appindicator-sharp.dll.config.in b/bindings/mono/ayatana-appindicator-sharp.dll.config.in
index 2d21d00..7061914 100644
--- a/bindings/mono/appindicator-sharp.dll.config.in
+++ b/bindings/mono/ayatana-appindicator-sharp.dll.config.in
@@ -1,5 +1,5 @@
 <configuration>
-  <dllmap dll="appindicator.dll" target="libappindicator@LIB_PREFIX@.1@LIB_SUFFIX@"/>
+  <dllmap dll="ayatana-appindicator.dll" target="libayatana-appindicator@LIB_PREFIX@.1@LIB_SUFFIX@"/>
   <dllmap dll="libgtk-2.0-0.dll" target="libgtk-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
diff --git a/bindings/mono/appindicator-sharp.snk b/bindings/mono/ayatana-appindicator-sharp.snk
index efb62d0..efb62d0 100644
--- a/bindings/mono/appindicator-sharp.snk
+++ b/bindings/mono/ayatana-appindicator-sharp.snk
diff --git a/bindings/mono/examples/IndicatorExample.cs b/bindings/mono/examples/AyatanaIndicatorExample.cs
index 7413c54..35f3c79 100644
--- a/bindings/mono/examples/IndicatorExample.cs
+++ b/bindings/mono/examples/AyatanaIndicatorExample.cs
@@ -18,7 +18,7 @@
  */
 
 using Gtk;
-using AppIndicator;
+using AyatanaAppIndicator;
 
 public class IndicatorExample
 {
@@ -36,9 +36,9 @@ public class IndicatorExample
 
                 ApplicationIndicator indicator = new ApplicationIndicator ("Example",
                                                                            "applications-microblogging-panel",
-                                                                           Category.ApplicationStatus);
+                                                                           AppIndicatorCategory.ApplicationStatus);
 
-                indicator.Status = Status.Attention;
+                indicator.AppIndicatorStatus = AppIndicatorStatus.Attention;
 
                 Menu menu = new Menu ();
                 var foo = new MenuItem ("Foo");
diff --git a/bindings/mono/examples/Makefile.am b/bindings/mono/examples/Makefile.am
index b929492..de93b20 100644
--- a/bindings/mono/examples/Makefile.am
+++ b/bindings/mono/examples/Makefile.am
@@ -1,10 +1,11 @@
-ASSEMBLY = IndicatorExample.exe
-CSFILES = IndicatorExample.cs
+ASSEMBLY = AyatanaIndicatorExample.exe
+CSFILES = AyatanaIndicatorExample.cs
 CLEANFILES = $(ASSEMBLY)
+DISTCLEANFILES = Makefile.in
 
 EXTRA_DIST = $(CSFILES)
 
-references = $(GTK_SHARP_LIBS) -r:$(top_builddir)/bindings/mono/appindicator-sharp.dll
+references = $(GTK_SHARP_LIBS) -r:$(top_builddir)/bindings/mono/ayatana-appindicator-sharp.dll
 
 $(ASSEMBLY): $(CSFILES) Makefile.am
 	$(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES)
diff --git a/bindings/mono/examples/indicator-example.in b/bindings/mono/examples/ayatana-indicator-example.in
index 3eca155..07d1473 100755
--- a/bindings/mono/examples/indicator-example.in
+++ b/bindings/mono/examples/ayatana-indicator-example.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-MONO_PATH=@top_builddir@/bindings/mono @top_builddir@/bindings/mono/examples/IndicatorExample.exe
+MONO_PATH=@top_builddir@/bindings/mono @top_builddir@/bindings/mono/examples/AyatanaIndicatorExample.exe
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libayatana-appindicator-api.metadata
index e610c88..e610c88 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libayatana-appindicator-api.metadata
diff --git a/bindings/mono/policy.0.0.appindicator-sharp.config.in b/bindings/mono/policy.0.0.ayatana-appindicator-sharp.config.in
index e1fe0db..e1fe0db 100644
--- a/bindings/mono/policy.0.0.appindicator-sharp.config.in
+++ b/bindings/mono/policy.0.0.ayatana-appindicator-sharp.config.in
diff --git a/bindings/mono/policy.0.1.appindicator-sharp.config.in b/bindings/mono/policy.0.1.ayatana-appindicator-sharp.config.in
index 0a8f9b1..0a8f9b1 100644
--- a/bindings/mono/policy.0.1.appindicator-sharp.config.in
+++ b/bindings/mono/policy.0.1.ayatana-appindicator-sharp.config.in
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index fe95c02..f57a2f7 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,10 +1,10 @@
 defsdir = $(datadir)/pygtk/2.0/defs
-defs_DATA = appindicator.defs
+defs_DATA = ayatana_appindicator.defs
 
 #CFLAGS = -Wall -Werror
 INCLUDES = \
 		-I$(top_srcdir)/src \
-        -DG_LOG_DOMAIN=\"appindicator-python\" \
+        -DG_LOG_DOMAIN=\"ayatana-appindicator-python\" \
         -DDATADIR=\"$(datadir)\" \
         -DLIBDIR=\"$(libdir)\" \
         $(APPINDICATOR_PYTHON_CFLAGS) \
@@ -13,20 +13,21 @@ INCLUDES = \
 pkgpythondir = $(pyexecdir)
 pkgpyexecdir = $(pyexecdir)
 
-pkgappindicatordir = $(pkgpythondir)/appindicator
+pkgappindicatordir = $(pkgpythondir)/ayatana_appindicator
 pkgappindicator_PYTHON = __init__.py
 
-appindicatordir = $(pkgpyexecdir)/appindicator
-appindicator_LTLIBRARIES = _appindicator.la
+appindicatordir = $(pkgpyexecdir)/ayatana_appindicator
+appindicator_LTLIBRARIES = _ayatana_appindicator.la
 
-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
-_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
-_appindicator_la_SOURCES = appindicatormodule.c
-nodist__appindicator_la_SOURCES = appindicator.c
+_ayatana_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
+_ayatana_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -layatana-appindicator
+_ayatana_appindicator_la_SOURCES = ayatana_appindicatormodule.c
+nodist__ayatana_appindicator_la_SOURCES = ayatana_appindicator.c
 
-CLEANFILES = appindicator.c
-EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA)
-appindicator.c: $(defs_DATA) appindicator.override
+CLEANFILES = ayatana_appindicator.c
+DISTCLEANFILES = Makefile.in
+EXTRA_DIST = ayatana_appindicator.override.in appindicator-arg-types.py $(defs_DATA)
+ayatana_appindicator.c: $(defs_DATA) ayatana_appindicator.override
 
 %.c: %.defs
 	($(PYGTK_CODEGEN) \
diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py
index 20e2140..5dd1329 100644
--- a/bindings/python/__init__.py
+++ b/bindings/python/__init__.py
@@ -24,4 +24,4 @@
 # License version 3 and version 2.1 along with this program.  If not, see 
 # <http://www.gnu.org/licenses/>
 
-from _appindicator import *
+from _ayatana_appindicator import *
diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py
index 9d74aa0..46066ca 100644
--- a/bindings/python/appindicator-arg-types.py
+++ b/bindings/python/appindicator-arg-types.py
@@ -1,4 +1,4 @@
-# Python bindings for libappindicator.
+# Python bindings for libayatana-appindicator.
 # 
 # Copyright 2009 Canonical Ltd.
 # 
diff --git a/bindings/python/appindicator.defs b/bindings/python/ayatana_appindicator.defs
index 4fcc2d5..4fcc2d5 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/ayatana_appindicator.defs
diff --git a/bindings/python/appindicator.override.in b/bindings/python/ayatana_appindicator.override.in
index 84d3159..3fdeb24 100644
--- a/bindings/python/appindicator.override.in
+++ b/bindings/python/ayatana_appindicator.override.in
@@ -1,5 +1,5 @@
 /*
-Python bindings for libappindicator.
+Python bindings for libayatana-appindicator.
 
 Copyright 2009 Canonical Ltd.
 
@@ -59,7 +59,7 @@ _appindicator_add_constants(PyObject *module, const gchar *strip_prefix)
                 PyErr_Print();
 }
 %%
-modulename appindicator
+modulename ayatana_appindicator
 %%
 import gobject.GObject as PyGObject_Type
 import gtk.Menu as PyGtkMenu_Type
diff --git a/bindings/python/appindicatormodule.c b/bindings/python/ayatana_appindicatormodule.c
index b66639c..31d23a2 100644
--- a/bindings/python/appindicatormodule.c
+++ b/bindings/python/ayatana_appindicatormodule.c
@@ -1,11 +1,13 @@
 /*
-Python bindings for libappindicator.
+Python bindings for libayatana-appindicator.
 
 Copyright 2009 Canonical Ltd.
+Copyright 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 
 Authors:
     Eitan Isaacson <eitan@ascender.com>
     Neil Jagdish Patel <neil.patel@canonical.com>
+    Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 
 This program is free software: you can redistribute it and/or modify it 
 under the terms of either or both of the following licenses:
@@ -37,13 +39,13 @@ init_appindicator(void)
 		
 		init_pygobject ();
 		
-		m = Py_InitModule ("_appindicator", pyappindicator_functions);
+		m = Py_InitModule ("_ayatana_appindicator", pyappindicator_functions);
 		d = PyModule_GetDict (m);
 		
 		pyappindicator_register_classes (d);
 
 		_appindicator_add_constants (m, "APP_INDICATOR_");
 		if (PyErr_Occurred ()) {
-				Py_FatalError ("can't initialise module appindicator");
+				Py_FatalError ("can't initialise module ayatana_appindicator");
 		}
 }
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 703e7a5..2763bc3 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -16,25 +16,26 @@ VER=
 endif
 
 vapidir = $(datadir)/vala/vapi
-vapiprefix = appindicator$(VER)-0.1
+vapiprefix = ayatana-appindicator$(VER)-0.1
 vapi_DATA = $(vapiprefix).vapi $(vapiprefix).deps
 DEPS = $(GTKVAPI)
 
 $(vapiprefix).deps:
 	echo $(DEPS) > $@
 
-$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \
-                    $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \
-                    appindicator-0.1-custom.vala \
+$(vapiprefix).vapi: $(top_builddir)/src/AyatanaAppIndicator$(VER)-0.1.gir \
+                    $(top_builddir)/src/AyatanaAppIndicator$(VER)-0.1.metadata \
+                    ayatana-appindicator-0.1-custom.vala \
                     $(vapiprefix).deps
 	$(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \
-	$< $(srcdir)/appindicator-0.1-custom.vala
+	$< $(srcdir)/ayatana-appindicator-0.1-custom.vala
 	
 
 CLEANFILES = $(vapi_DATA)
+DISTCLEANFILES = Makefile.in
 
 endif
 endif
 
 EXTRA_DIST = \
-	appindicator-0.1-custom.vala
+	ayatana-appindicator-0.1-custom.vala
diff --git a/bindings/vala/appindicator-0.1-custom.vala b/bindings/vala/ayatana-appindicator-0.1-custom.vala
index 9fa51eb..9fa51eb 100644
--- a/bindings/vala/appindicator-0.1-custom.vala
+++ b/bindings/vala/ayatana-appindicator-0.1-custom.vala
diff --git a/bindings/vala/examples/Makefile.am b/bindings/vala/examples/Makefile.am
index 67ad932..315447c 100644
--- a/bindings/vala/examples/Makefile.am
+++ b/bindings/vala/examples/Makefile.am
@@ -4,36 +4,37 @@ else
 VER=
 endif
 
-VALAFILES = indicator-example.vala
+VALAFILES = ayatana-indicator-example.vala
 EXTRA_DIST = $(VALAFILES)
 
 VALAFLAGS = \
-	--pkg appindicator$(VER)-0.1 \
+	--pkg ayatana-appindicator$(VER)-0.1 \
 	--vapidir=$(top_builddir)/bindings/vala \
 	--save-temps
 
 if HAVE_VALAC
 
-BUILT_SOURCES = indicator-example.c
+BUILT_SOURCES = ayatana-indicator-example.c
 
-indicator-example.c: $(VALAFILES) Makefile.am
+ayatana-indicator-example.c: $(VALAFILES) Makefile.am
 	$(VALAC) $(VALAFLAGS) -C $< -o $@
-	$(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@
+	$(SED) -i "s|#include\s*<\s*libayatana-appindicator/app-indicator.h\s*>||g" $@
 
-nodist_indicator_example_SOURCES = indicator-example.c
-indicator_example_CFLAGS = \
+nodist_ayatana_indicator_example_SOURCES = ayatana-indicator-example.c
+ayatana_indicator_example_CFLAGS = \
 	$(LIBRARY_CFLAGS) \
 	-Wall \
 	-I$(top_srcdir)/src \
 	-include $(top_srcdir)/src/app-indicator.h
-indicator_example_LDADD = \
+ayatana_indicator_example_LDADD = \
 	$(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
-check_PROGRAMS = indicator-example
+check_PROGRAMS = ayatana-indicator-example
 
 CLEANFILES = \
 	*.c \
-	indicator-example
+	ayatana-indicator-example
+DISTCLEANFILES = Makefile.in
 
 endif
diff --git a/bindings/vala/examples/indicator-example.vala b/bindings/vala/examples/ayatana-indicator-example.vala
index 764009f..764009f 100644
--- a/bindings/vala/examples/indicator-example.vala
+++ b/bindings/vala/examples/ayatana-indicator-example.vala
diff --git a/configure.ac b/configure.ac
index d131c9e..a7f352e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
-AC_INIT([libappindicator],
-        [12.10.0],
-        [http://bugs.launchpad.net/libappindicator],
-        [libappindicator],
-        [http://launchpad.net/libappindicator])
-AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
+AC_INIT([libayatana-appindicator],
+        [0.5.0],
+        [https://github.com/ArcticaProject/libayatana-appindicator/issues],
+        [libayatana-appindicator],
+        [https://github.com/ArcticaProject/libayatana-appindicator])
+AC_COPYRIGHT([Copyright 2009, 2010 Canonical
+Copyright 2015, Arctica Project])
 
 AC_PREREQ([2.64])
 
@@ -19,6 +20,7 @@ AM_SILENT_RULES([yes])
 # Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+AM_PROG_AR
 
 # Initialize libtool
 LT_PREREQ([2.2])
@@ -44,7 +46,7 @@ GTK_REQUIRED_VERSION=2.18
 GTK3_REQUIRED_VERSION=2.91
 GLIB_REQUIRED_VERSION=2.35.4
 GIO_REQUIRED_VERSION=2.26
-INDICATOR_REQUIRED_VERSION=0.4.93
+INDICATOR_REQUIRED_VERSION=0.6.0
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 DBUS_GLIB_REQUIRED_VERSION=0.82
 
@@ -57,7 +59,7 @@ AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(LIBRARY,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                      glib-2.0 >= $GLIB_REQUIRED_VERSION
                                      gio-2.0 >= $GIO_REQUIRED_VERSION
-                                     indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                                     ayatana-indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                      dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
          AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
         ],
@@ -65,7 +67,7 @@ AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(LIBRARY,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                      glib-2.0 >= $GLIB_REQUIRED_VERSION
                                      gio-2.0 >= $GIO_REQUIRED_VERSION
-                                     indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
+                                     ayatana-indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                      dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
         ],
       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
@@ -236,11 +238,11 @@ AC_SUBST(COVERAGE_LDFLAGS)
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-src/appindicator-0.1.pc
-src/appindicator3-0.1.pc
+src/ayatana-appindicator-0.1.pc
+src/ayatana-appindicator3-0.1.pc
 bindings/Makefile
 bindings/python/Makefile
-bindings/python/appindicator.override
+bindings/python/ayatana_appindicator.override
 bindings/vala/Makefile
 bindings/vala/examples/Makefile
 tests/Makefile
@@ -248,17 +250,17 @@ example/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
-docs/reference/libappindicator-docs.sgml
+docs/reference/libayatana-appindicator-docs.sgml
 ])
 
 if test "x$has_mono" = "xtrue" ; then
     AC_CONFIG_FILES([
     bindings/mono/Makefile
-    bindings/mono/appindicator-sharp.dll.config
-    bindings/mono/appindicator-sharp-0.1.pc
+    bindings/mono/ayatana-appindicator-sharp.dll.config
+    bindings/mono/ayatana-appindicator-sharp-0.1.pc
     bindings/mono/app-indicator.sources.xml
     bindings/mono/examples/Makefile
-    bindings/mono/examples/indicator-example
+    bindings/mono/examples/ayatana-indicator-example
     ])
 fi
 
@@ -270,7 +272,7 @@ AC_OUTPUT
 
 AC_MSG_NOTICE([
 
-Libappindicator Configuration:
+libayatana-appindicator Configuration:
 
 	Prefix:        $prefix
 	GTK+ Version:  $with_gtk
diff --git a/debian/changelog b/debian/changelog
index c806933..e76bbd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libayatana-appindicator (0.5.0-0) UNRELEASED; urgency=medium
+
+  * Fork from Ubuntu's libappindicator project.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 09 Nov 2015 14:00:48 +0000
+
 libappindicator (12.10.1+15.04.20141110-0ubuntu1) vivid; urgency=low
 
   [ Lars Uebernickel ]
diff --git a/debian/control b/debian/control
index 30c1b62..9c7c502 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
-Source: libappindicator
+Source: libayatana-appindicator
 Section: gnome
 Priority: optional
 XS-Python-Version: all
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                python-all-dev,
                at-spi2-core,
-               cli-common-dev (>= 0.5.7) [!arm64 !ppc64el],
+               cli-common-dev (>= 0.8~) [!arm64 !ppc64el],
                gobject-introspection,
                intltool,
                gtk-doc-tools,
@@ -24,139 +24,145 @@ Build-Depends: debhelper (>= 9),
                gtk-sharp2-gapi [!arm64 !ppc64el],
                libgtk2.0-cil-dev [!arm64 !ppc64el],
                libdbus-glib-1-dev (>= 0.82),
-               libindicator-dev (>= 0.3.90),
-               libindicator3-dev (>= 0.3.90),
+               libayatana-indicator-dev (>= 0.6.0),
+               libayatana-indicator3-dev (>= 0.6.0),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libgirepository1.0-dev,
-Standards-Version: 3.9.1
-Homepage: https://launchpad.net/libappindicator
-# If you aren't a member of ~indicator-applet-developers but need to upload
-# packaging changes, just go ahead.  ~indicator-applet-developers will notice
-# and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04/files
+Standards-Version: 3.9.6
+Homepage: https://github.com/ArcticaProject/libayatana-appindicator
+Vcs-Git: git://cgit.arctica-project.org/ayatana/libayatana-appindicator.git
+Vcs-Browser: https://cgit.arctica-project.org/ayatana/libayatana-appindicator.git/
 
-Package: python-appindicator
+Package: python-ayatana-appindicator
 Section: python
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
+         libayatana-appindicator1 (= ${binary:Version}),
          python-gobject,
 Provides: ${python:Provides},
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
+Description: Python bindings for libayatana-appindicator (GTK2 version)
+ A library and indicator to take menus from applications and place them in
+ the panel.
+ .
+ This package provides Python bindings so that you can use
+ libayatana-appindicator from a Python program.
 
-Package: libappindicator1
+Package: libayatana-appindicator1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: indicator-application (>= 0.2.93),
-Description: Application Indicators
+Recommends: ayatana-indicator-application (>= 0.2.93),
+Description: Ayatana Application Indicators (GTK2 version)
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains shared libraries to be used by applications.
+ This package contains shared libraries to be used by applications compiled
+ against GTK2.
 
-Package: gir1.2-appindicator-0.1
+Package: gir1.2-ayatanaappindicator-0.1
 Section: introspection
 Architecture: any
 Depends: ${misc:Depends},
          ${gir:Depends},
-Description: Typelib files for libappindicator1.
+Description: Typelib files for libayatana-appindicator1 (GTK2 version).
+ A library and indicator to take menus from applications and place them in
+ the panel.
  .
  This package can be used by other packages using the GIRepository format
- to generate dynamic bindings.
+ to generate dynamic bindings (GTK2 version).
 
-Package: libappindicator-dev
+Package: libayatana-appindicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-appindicator-0.1 (= ${binary:Version}),
+         gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
-         libappindicator1 (= ${binary:Version}),
-Description: Application Indicators
+         libayatana-appindicator1 (= ${binary:Version}),
+Description: Ayatana Application Indicators (development files, GTK2 version)
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains files that are needed to build applications.
+ This package contains files that are needed to build applications (GTK2
+ version).
 
-Package: libappindicator-doc
+Package: libayatana-appindicator-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
-Description:  Application Indicators
+Description:  Ayatana Application Indicators (documentation files, GTK2 version)
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains developer documentation.
+ This package contains developer documentation (GTK2 version).
 
-Package: libappindicator3-1
+Package: libayatana-appindicator3-1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: indicator-application (>= 0.2.93),
-Description: Application Indicators
+Recommends: ayatana-indicator-application (>= 0.2.93),
+Description: Ayatana Application Indicators (GTK3 version)
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains shared libraries to be used by applications.
+ This package contains shared libraries to be used by applications compiled
+ against GTK3.
 
-Package: libappindicator3-dev
+Package: libayatana-appindicator3-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-appindicator3-0.1 (= ${binary:Version}),
+         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
-         libappindicator3-1 (= ${binary:Version}),
-Description: Application Indicators
+         libayatana-appindicator3-1 (= ${binary:Version}),
+Description: Ayatana Application Indicators (development files, GTK3 version)
  A library and indicator to take menus from applications and place them in
  the panel.
  .
- This package contains files that are needed to build applications.
+ This package contains files that are needed to build applications (GTK3
+ version).
 
-Package: gir1.2-appindicator3-0.1
+Package: gir1.2-ayatanaappindicator3-0.1
 Section: introspection
 Architecture: any
 Depends: ${misc:Depends},
          ${gir:Depends},
-Description: Typelib files for libappindicator3-1.
+Description: Typelib files for libayatana-appindicator3-1 (GTK3 version)
+ A library and indicator to take menus from applications and place them in
+ the panel.
  .
  This package can be used by other packages using the GIRepository format
- to generate dynamic bindings.
+ to generate dynamic bindings (GTK3 version).
 
-Package: libappindicator0.1-cil
+Package: libayatana-appindicator0.1-cil
 Section: cli-mono
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-Description: CLI bindings for libappindicator
+Description: CLI bindings for libayatana-appindicator
  This package provides the appindicator-sharp assembly that allows CLI (.NET)
  programs to take menus from applications and place them in the panel.
  .
  This package contains assemblies to be used by applications.
 
-Package: libappindicator0.1-cil-dev
-Section: libdevel
+Package: libayatana-appindicator0.1-cil-dev
+Section: cli-mono
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-         libappindicator0.1-cil (= ${binary:Version}),
+         libayatana-appindicator0.1-cil (= ${binary:Version}),
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install
deleted file mode 100644
index 00139ac..0000000
--- a/debian/gir1.2-appindicator-0.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/gir1.2-appindicator3-0.1.install b/debian/gir1.2-appindicator3-0.1.install
deleted file mode 100644
index 46bb935..0000000
--- a/debian/gir1.2-appindicator3-0.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/gir1.2-ayatanaappindicator-0.1.install b/debian/gir1.2-ayatanaappindicator-0.1.install
new file mode 100644
index 0000000..e9a3f26
--- /dev/null
+++ b/debian/gir1.2-ayatanaappindicator-0.1.install
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0/AyatanaAppIndicator-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/gir1.2-ayatanaappindicator3-0.1.install b/debian/gir1.2-ayatanaappindicator3-0.1.install
new file mode 100644
index 0000000..ab51907
--- /dev/null
+++ b/debian/gir1.2-ayatanaappindicator3-0.1.install
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0/AyatanaAppIndicator3-0.1.typelib usr/lib/girepository-1.0
diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install
deleted file mode 100644
index 092a809..0000000
--- a/debian/libappindicator-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/libappindicator-0.1/*
-usr/lib/*/libappindicator.so
-usr/lib/*/pkgconfig/appindicator-0.1.pc
-usr/share/gir-1.0/AppIndicator-0.1.gir
-usr/share/vala/vapi/appindicator-0.1.vapi
diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install
deleted file mode 100644
index f2d9d8e..0000000
--- a/debian/libappindicator-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/gtk-doc/html/libappindicator/*
diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install
deleted file mode 100644
index 22bd601..0000000
--- a/debian/libappindicator0.1-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc usr/share/pkgconfig
diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install
deleted file mode 100644
index 1a0aeca..0000000
--- a/debian/libappindicator0.1-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cli/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.1/
diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac
deleted file mode 100644
index f3e5bfc..0000000
--- a/debian/libappindicator0.1-cil.installcligac
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
-/usr/lib/cli/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll
-/usr/lib/cli/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll
diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install
deleted file mode 100644
index 94db7c9..0000000
--- a/debian/libappindicator1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libappindicator.so.*
diff --git a/debian/libappindicator3-1.install b/debian/libappindicator3-1.install
deleted file mode 100644
index b77e45c..0000000
--- a/debian/libappindicator3-1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libappindicator3.so.*
diff --git a/debian/libappindicator3-dev.install b/debian/libappindicator3-dev.install
deleted file mode 100644
index 50dc770..0000000
--- a/debian/libappindicator3-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/libappindicator3.so
-usr/lib/*/pkgconfig/appindicator3-0.1.pc
-usr/include/libappindicator3-0.1/*
-usr/share/gir-1.0/AppIndicator3-0.1.gir
-usr/share/vala/vapi/appindicator3-0.1.vapi
diff --git a/debian/libayatana-appindicator-dev.install b/debian/libayatana-appindicator-dev.install
new file mode 100644
index 0000000..763a667
--- /dev/null
+++ b/debian/libayatana-appindicator-dev.install
@@ -0,0 +1,5 @@
+usr/include/libayatana-appindicator-0.1/*
+usr/lib/*/libayatana-appindicator.so
+usr/lib/*/pkgconfig/ayatana-appindicator-0.1.pc
+usr/share/gir-1.0/AyatanaAppIndicator-0.1.gir
+usr/share/vala/vapi/ayatana-appindicator-0.1.vapi
diff --git a/debian/libayatana-appindicator-doc.install b/debian/libayatana-appindicator-doc.install
new file mode 100644
index 0000000..f454912
--- /dev/null
+++ b/debian/libayatana-appindicator-doc.install
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/libayatana-appindicator/*
diff --git a/debian/libayatana-appindicator0.1-cil-dev.install b/debian/libayatana-appindicator0.1-cil-dev.install
new file mode 100644
index 0000000..5194099
--- /dev/null
+++ b/debian/libayatana-appindicator0.1-cil-dev.install
@@ -0,0 +1 @@
+usr/lib/*/pkgconfig/ayatana-appindicator-sharp-0.1.pc
diff --git a/debian/libayatana-appindicator0.1-cil.install b/debian/libayatana-appindicator0.1-cil.install
new file mode 100644
index 0000000..2ce8022
--- /dev/null
+++ b/debian/libayatana-appindicator0.1-cil.install
@@ -0,0 +1 @@
+usr/lib/*/cli/ayatana-appindicator-sharp-0.1/* /usr/lib/cli/ayatana-appindicator-sharp-0.1/
diff --git a/debian/libayatana-appindicator0.1-cil.installcligac b/debian/libayatana-appindicator0.1-cil.installcligac
new file mode 100644
index 0000000..a041e9e
--- /dev/null
+++ b/debian/libayatana-appindicator0.1-cil.installcligac
@@ -0,0 +1,3 @@
+/usr/lib/cli/ayatana-appindicator-sharp-0.1/ayatana-appindicator-sharp.dll
+/usr/lib/cli/ayatana-appindicator-sharp-0.1/policy.0.0.ayatana-appindicator-sharp.dll
+/usr/lib/cli/ayatana-appindicator-sharp-0.1/policy.0.1.ayatana-appindicator-sharp.dll
diff --git a/debian/libayatana-appindicator1.install b/debian/libayatana-appindicator1.install
new file mode 100644
index 0000000..96d99db
--- /dev/null
+++ b/debian/libayatana-appindicator1.install
@@ -0,0 +1 @@
+usr/lib/*/libayatana-appindicator.so.*
diff --git a/debian/libappindicator1.symbols b/debian/libayatana-appindicator1.symbols
index ded488e..6ffb9c7 100644
--- a/debian/libappindicator1.symbols
+++ b/debian/libayatana-appindicator1.symbols
@@ -1,4 +1,4 @@
-libappindicator.so.1 libappindicator1 #MINVER#
+libayatana-appindicator.so.1 libayatana-appindicator1 #MINVER#
  app_indicator_build_menu_from_desktop@Base 0.2.91
  app_indicator_category_get_type@Base 0.2.91
  app_indicator_get_attention_icon@Base 0.2.91
diff --git a/debian/libayatana-appindicator3-1.install b/debian/libayatana-appindicator3-1.install
new file mode 100644
index 0000000..e6eda14
--- /dev/null
+++ b/debian/libayatana-appindicator3-1.install
@@ -0,0 +1 @@
+usr/lib/*/libayatana-appindicator3.so.*
diff --git a/debian/libappindicator3-1.symbols b/debian/libayatana-appindicator3-1.symbols
index 3b63f22..cb8f189 100644
--- a/debian/libappindicator3-1.symbols
+++ b/debian/libayatana-appindicator3-1.symbols
@@ -1,4 +1,4 @@
-libappindicator3.so.1 libappindicator3-1 #MINVER#
+libayatana-appindicator3.so.1 libayatana-appindicator3-1 #MINVER#
  app_indicator_build_menu_from_desktop@Base 0.2.92
  app_indicator_category_get_type@Base 0.2.92
  app_indicator_get_attention_icon@Base 0.2.92
diff --git a/debian/libayatana-appindicator3-dev.install b/debian/libayatana-appindicator3-dev.install
new file mode 100644
index 0000000..59edd11
--- /dev/null
+++ b/debian/libayatana-appindicator3-dev.install
@@ -0,0 +1,5 @@
+usr/lib/*/libayatana-appindicator3.so
+usr/lib/*/pkgconfig/ayatana-appindicator3-0.1.pc
+usr/include/libayatana-appindicator3-0.1/*
+usr/share/gir-1.0/AyatanaAppIndicator3-0.1.gir
+usr/share/vala/vapi/ayatana-appindicator3-0.1.vapi
diff --git a/debian/python-appindicator.install b/debian/python-ayatana-appindicator.install
index b468dac..b468dac 100644
--- a/debian/python-appindicator.install
+++ b/debian/python-ayatana-appindicator.install
diff --git a/debian/rules b/debian/rules
index 4fe4e6b..e4f1b8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,17 +60,17 @@ override_dh_install:
 	find debian/tmp -name \*.la -exec rm {} \;
 	find debian/tmp -name \*.a -exec rm {} \;
 	rm -rf debian/tmp/*/usr/lib/mono
-	rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps
-	dh_install -ppython-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -pgir1.2-appindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibappindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -pgir1.2-appindicator3-0.1 --fail-missing --sourcedir=debian/tmp/gtk3
-	dh_install -plibappindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -plibappindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2
+	rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps
+	dh_install -ppython-ayatana-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-appindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -pgir1.2-ayatanaappindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-appindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-appindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-appindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibayatana-appindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -pgir1.2-ayatanaappindicator3-0.1 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibayatana-appindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibayatana-appindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2
 
 override_dh_auto_test: $(FLAVORS:%=dotest-%)
 
@@ -90,4 +90,3 @@ dotestgtk2-%:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
-
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 2e00b43..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://launchpad.net/libappindicator/+download .*/libappindicator-([0-9.]+)\.tar\.gz
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f3ddc22..e12f36d 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1,2 @@
 SUBDIRS = reference
+DISTCLEANFILES = Makefile.in
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index fd3479c..b7ceba4 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = 1.6
 
 if USE_GTK3
 VER=3
-APPINDICATORLIB = libappindicator3.la
+APPINDICATORLIB = libayatana-appindicator3.la
 else
 VER=
-APPINDICATORLIB = libappindicator.la
+APPINDICATORLIB = libayatana-appindicator.la
 endif
 
 # This is a blank Makefile.am for using gtk-doc.
@@ -17,7 +17,7 @@ endif
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=libappindicator
+DOC_MODULE=libayatana-appindicator
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 #DOC_MODULE_VERSION=2
@@ -106,7 +106,7 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in libappindicator-docs.sgml.in
+EXTRA_DIST += version.xml.in libayatana-appindicator-docs.sgml.in
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
@@ -121,3 +121,5 @@ TESTS_ENVIRONMENT = cd $(srcdir) && \
   SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
 #TESTS = $(GTKDOC_CHECK)
 endif
+
+DISTCLEANFILES = Makefile.in
\ No newline at end of file
diff --git a/docs/reference/libappindicator-docs.sgml.in b/docs/reference/libayatana-appindicator-docs.sgml.in
index b6f8009..e76b2ec 100644
--- a/docs/reference/libappindicator-docs.sgml.in
+++ b/docs/reference/libayatana-appindicator-docs.sgml.in
@@ -6,9 +6,9 @@
 ]>
 <book id="index">
   <bookinfo>
-    <title>libappindicator Reference Manual</title>
+    <title>libayatana-appindicator Reference Manual</title>
     <releaseinfo>
-      for libappindicator @VERSION@
+      for libayatana-appindicator @VERSION@
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/libayatana-appindicator-overrides.txt b/docs/reference/libayatana-appindicator-overrides.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docs/reference/libayatana-appindicator-overrides.txt
diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libayatana-appindicator-sections.txt
index d9e1196..3bed826 100644
--- a/docs/reference/libappindicator-sections.txt
+++ b/docs/reference/libayatana-appindicator-sections.txt
@@ -16,7 +16,7 @@ APP_INDICATOR_SIGNAL_SCROLL_EVENT
 AppIndicatorCategory
 AppIndicatorStatus
 AppIndicatorPrivate
-<TITLE>AppIndicator</TITLE>
+<TITLE>Ayatana AppIndicator</TITLE>
 AppIndicator
 AppIndicatorClass
 app_indicator_get_type
@@ -49,4 +49,3 @@ app_indicator_get_secondary_activate_target
 app_indicator_get_title
 app_indicator_build_menu_from_desktop
 </SECTION>
-
diff --git a/docs/reference/libappindicator.types b/docs/reference/libayatana-appindicator.types
index 5000a2d..5000a2d 100644
--- a/docs/reference/libappindicator.types
+++ b/docs/reference/libayatana-appindicator.types
diff --git a/example/Makefile.am b/example/Makefile.am
index ff313f6..0509e3e 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -5,6 +5,7 @@ VER=
 endif
 
 CLEANFILES =
+DISTCLEANFILES = Makefile Makefile.in .deps/
 EXTRA_DIST = 
 
 check_PROGRAMS = \
@@ -27,7 +28,7 @@ simple_client_CFLAGS = \
 
 simple_client_LDADD = \
 	$(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 EXTRA_DIST += \
 	simple-client-test-icon.png
@@ -44,7 +45,7 @@ VALAFLAGS = \
 BUILT_SOURCES = simple-client-vala.c
 simple-client-vala.c: $(srcdir)/simple-client-vala.vala
 	$(VALAC) $(VALAFLAGS) -C $< -o $@
-	$(SED) -i "s|#include\s*<\s*libappindicator/app-indicator.h\s*>||g" $@
+	$(SED) -i "s|#include\s*<\s*libayatana-appindicator/app-indicator.h\s*>||g" $@
 
 simple_client_vala_SOURCES = simple-client-vala.c
 simple_client_vala_CFLAGS = \
@@ -59,3 +60,4 @@ endif
 
 EXTRA_DIST += \
 	simple-client-vala.vala
+
diff --git a/src/AppIndicator-0.1.metadata.in b/src/AyatanaAppIndicator-0.1.metadata.in
index 5790ddb..1af31e7 100644
--- a/src/AppIndicator-0.1.metadata.in
+++ b/src/AyatanaAppIndicator-0.1.metadata.in
@@ -1,3 +1,3 @@
-AppIndicator name="AppIndicator"
+AyatanaAppIndicator name="AppIndicator"
 Indicator.priv hidden="1"
 IndicatorPrivate hidden="1"
diff --git a/src/AppIndicator3-0.1.metadata.in b/src/AyatanaAppIndicator3-0.1.metadata.in
index 8d094fd..09d457d 100644
--- a/src/AppIndicator3-0.1.metadata.in
+++ b/src/AyatanaAppIndicator3-0.1.metadata.in
@@ -1,3 +1,3 @@
-AppIndicator3 name="AppIndicator"
+AyatanaAppIndicator3 name="AppIndicator"
 Indicator.priv hidden="1"
 IndicatorPrivate hidden="1"
diff --git a/src/Makefile.am b/src/Makefile.am
index 960c861..c4c56fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,21 +1,21 @@
 if USE_GTK3
 VER=3
-lib_LTLIBRARIES = libappindicator3.la
+lib_LTLIBRARIES = libayatana-appindicator3.la
 GTKGIR = Gtk-3.0
 else
 VER=
-lib_LTLIBRARIES = libappindicator.la
+lib_LTLIBRARIES = libayatana-appindicator.la
 GTKGIR = Gtk-2.0
 endif
 
 CLEANFILES =
-DISTCLEANFILES =
+DISTCLEANFILES = Makefile.in
 BUILT_SOURCES =
 EXTRA_DIST = \
-	appindicator-0.1.pc.in \
-	appindicator3-0.1.pc.in \
-	AppIndicator-0.1.metadata.in \
-	AppIndicator3-0.1.metadata.in
+	ayatana-appindicator-0.1.pc.in \
+	ayatana-appindicator3-0.1.pc.in \
+	AyatanaAppIndicator-0.1.metadata.in \
+	AyatanaAppIndicator3-0.1.metadata.in
 
 include $(top_srcdir)/Makefile.am.enum
 include $(top_srcdir)/Makefile.am.marshal
@@ -35,27 +35,27 @@ glib_marshal_prefix = _application_service_marshal
 # Library
 ##################################
 
-pkgconfig_DATA = appindicator$(VER)-0.1.pc
+pkgconfig_DATA = ayatana-appindicator$(VER)-0.1.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 glib_enum_h = app-indicator-enum-types.h
 glib_enum_c = app-indicator-enum-types.c
-glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
+glib_enum_headers = $(addprefix $(srcdir)/, $(libayatana_appindicator_headers))
 
 DISTCLEANFILES += app-indicator-enum-types.c
 
-libappindicatorincludefolder=libappindicator
-libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/$(libappindicatorincludefolder)
+libayatana_appindicatorincludefolder=libayatana-appindicator
+libayatana_appindicatorincludedir=$(includedir)/libayatana-appindicator$(VER)-0.1/$(libayatana_appindicatorincludefolder)
 
-libappindicator_headers = \
+libayatana_appindicator_headers = \
 	app-indicator.h
 
-libappindicatorinclude_HEADERS = \
-	$(libappindicator_headers) \
+libayatana_appindicatorinclude_HEADERS = \
+	$(libayatana_appindicator_headers) \
 	$(glib_enum_h)
 
-libappindicator_la_SOURCES = \
-	$(libappindicator_headers) \
+libayatana_appindicator_la_SOURCES = \
+	$(libayatana_appindicator_headers) \
 	app-indicator-enum-types.c \
 	app-indicator.c \
 	application-service-marshal.c \
@@ -67,31 +67,31 @@ libappindicator_la_SOURCES = \
 	gen-notification-watcher.xml.h \
 	gen-notification-watcher.xml.c
 
-libappindicator_la_LDFLAGS = \
+libayatana_appindicator_la_LDFLAGS = \
 	$(COVERAGE_LDFLAGS) \
 	-version-info 1:0:0 \
 	-no-undefined \
 	-export-symbols-regex "^[^_d].*"
 
-libappindicator_la_CFLAGS = \
+libayatana_appindicator_la_CFLAGS = \
 	$(LIBRARY_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-Wall -Werror -Wno-error=deprecated-declarations \
-	-DG_LOG_DOMAIN=\"libappindicator\"
+	-DG_LOG_DOMAIN=\"libayatana-appindicator\"
 
-libappindicator_la_LIBADD = \
+libayatana_appindicator_la_LIBADD = \
 	$(LIBRARY_LIBS)
 
 # We duplicate these here because Automake won't let us use $(VER) on the left hand side.
 # Since we carefully use $(VER) in the right hand side above, we can assign the same values.
 # Only one version of the library is every compiled at the same time, so it is safe to reuse
 # the right hand sides like this.
-libappindicator3includedir = $(libappindicatorincludedir)
-libappindicator3include_HEADERS = $(libappindicatorinclude_HEADERS)
-libappindicator3_la_SOURCES = $(libappindicator_la_SOURCES)
-libappindicator3_la_LDFLAGS = $(libappindicator_la_LDFLAGS)
-libappindicator3_la_CFLAGS = $(libappindicator_la_CFLAGS)
-libappindicator3_la_LIBADD = $(libappindicator_la_LIBADD)
+libayatana_appindicator3includedir = $(libayatana_appindicatorincludedir)
+libayatana_appindicator3include_HEADERS = $(libayatana_appindicatorinclude_HEADERS)
+libayatana_appindicator3_la_SOURCES = $(libayatana_appindicator_la_SOURCES)
+libayatana_appindicator3_la_LDFLAGS = $(libayatana_appindicator_la_LDFLAGS)
+libayatana_appindicator3_la_CFLAGS = $(libayatana_appindicator_la_CFLAGS)
+libayatana_appindicator3_la_LIBADD = $(libayatana_appindicator_la_LIBADD)
 
 ##################################
 # DBus Specs
@@ -135,14 +135,14 @@ INTROSPECTION_GIRS =
 if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=$(srcdir) \
-	$(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) \
+	$(addprefix --c-include=$(libayatana_appindicatorincludefolder)/, $(libayatana_appindicator_headers)) \
 	--symbol-prefix=app \
 	--identifier-prefix=App \
 	--warn-all
 else
 INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=$(srcdir) \
-	$(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers))
+	$(addprefix --c-include=$(libayatana_appindicatorincludefolder)/, $(libayatana_appindicator_headers))
 endif
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
@@ -151,31 +151,31 @@ if HAVE_INTROSPECTION
 
 introspection_sources = \
 	$(addprefix $(srcdir)/,app-indicator.c) \
-	$(addprefix $(srcdir)/,$(libappindicator_headers))
+	$(addprefix $(srcdir)/,$(libayatana_appindicator_headers))
 
-AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la
+AyatanaAppIndicator$(VER)-0.1.gir: libayatana-appindicator$(VER).la
 
-AppIndicator_0_1_gir_INCLUDES = \
+AyatanaAppIndicator_0_1_gir_INCLUDES = \
     GObject-2.0 \
     $(GTKGIR)
-AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
-AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
-AppIndicator_0_1_gir_FILES = $(introspection_sources)
-# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
+AyatanaAppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AyatanaAppIndicator_0_1_gir_LIBS = libayatana-appindicator$(VER).la
+AyatanaAppIndicator_0_1_gir_FILES = $(introspection_sources)
+# AyatanaAppIndicator_0_1_gir_NAMESPACE = AyatanaAppIndicator
 
-AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
-AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
-AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
-AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES)
-# AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
+AyatanaAppIndicator3_0_1_gir_INCLUDES = $(AyatanaAppIndicator_0_1_gir_INCLUDES)
+AyatanaAyatanaAppIndicator3_0_1_gir_CFLAGS = $(AyatanaAyatanaAppIndicator_0_1_gir_CFLAGS)
+AyatanaAppIndicator3_0_1_gir_LIBS = $(AyatanaAppIndicator_0_1_gir_LIBS)
+AyatanaAppIndicator3_0_1_gir_FILES = $(AyatanaAppIndicator_0_1_gir_FILES)
+# AyatanaAppIndicator3_0_1_gir_NAMESPACE = AyatanaAppIndicator
 
-INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir
+INTROSPECTION_GIRS += AyatanaAppIndicator$(VER)-0.1.gir
 
-AppIndicator$(VER)-0.1.metadata: AppIndicator$(VER)-0.1.gir
+AyatanaAppIndicator$(VER)-0.1.metadata: AyatanaAppIndicator$(VER)-0.1.gir
 	cp -f $(srcdir)/$@.in $@
 
-BUILT_SOURCES += AppIndicator$(VER)-0.1.metadata
-CLEANFILES += AppIndicator$(VER)-0.1.metadata
+BUILT_SOURCES += AyatanaAppIndicator$(VER)-0.1.metadata
+CLEANFILES += AyatanaAppIndicator$(VER)-0.1.metadata
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/src/app-indicator.c b/src/app-indicator.c
index ff06a08..5683129 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -36,7 +36,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <libdbusmenu-gtk/client.h>
 #include <libdbusmenu-gtk/parser.h>
 
-#include <libindicator/indicator-desktop-shortcuts.h>
+#include <libayatana-indicator/indicator-desktop-shortcuts.h>
 
 #include "app-indicator.h"
 #include "app-indicator-enum-types.h"
diff --git a/src/appindicator-0.1.pc.in b/src/appindicator-0.1.pc.in
deleted file mode 100644
index d885fd3..0000000
--- a/src/appindicator-0.1.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
-includedir=@includedir@
-
-Cflags: -I${includedir}/libappindicator-0.1
-Requires: dbusmenu-glib-0.4 gtk+-2.0
-Libs: -L${libdir} -lappindicator
-
-Name: appindicator-0.1
-Description: Application indicators
-Version: @VERSION@
-
diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in
deleted file mode 100644
index f59ac70..0000000
--- a/src/appindicator3-0.1.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
-includedir=@includedir@
-
-Cflags: -I${includedir}/libappindicator3-0.1
-Requires: dbusmenu-glib-0.4 gtk+-3.0
-Libs: -L${libdir} -lappindicator3
-
-Name: appindicator3-0.1
-Description: Application indicators
-Version: @VERSION@
-
diff --git a/src/ayatana-appindicator-0.1.pc.in b/src/ayatana-appindicator-0.1.pc.in
new file mode 100644
index 0000000..4e35cb4
--- /dev/null
+++ b/src/ayatana-appindicator-0.1.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+Cflags: -I${includedir}/libayatana-appindicator-0.1
+Requires: dbusmenu-glib-0.4 gtk+-2.0
+Libs: -L${libdir} -layatana-appindicator
+
+Name: ayatana-appindicator-0.1
+Description: Ayatana Application Indicators
+Version: @VERSION@
+
diff --git a/src/ayatana-appindicator3-0.1.pc.in b/src/ayatana-appindicator3-0.1.pc.in
new file mode 100644
index 0000000..51eb96b
--- /dev/null
+++ b/src/ayatana-appindicator3-0.1.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+Cflags: -I${includedir}/libayatana-appindicator3-0.1
+Requires: dbusmenu-glib-0.4 gtk+-3.0
+Libs: -L${libdir} -layatana-appindicator3
+
+Name: ayatana-appindicator3-0.1
+Description: Ayatana Application Indicators
+Version: @VERSION@
+
diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index 71c063e..76d9773 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -20,9 +20,9 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#define INDICATOR_APPLICATION_DBUS_ADDR        "com.canonical.indicator.application"
-#define INDICATOR_APPLICATION_DBUS_OBJ         "/com/canonical/indicator/application/service"
-#define INDICATOR_APPLICATION_DBUS_IFACE       "com.canonical.indicator.application.service"
+#define INDICATOR_APPLICATION_DBUS_ADDR        "org.ayatana.indicator.application"
+#define INDICATOR_APPLICATION_DBUS_OBJ         "/org.ayatana.indicator.application/service"
+#define INDICATOR_APPLICATION_DBUS_IFACE       "org.ayatana.indicator.application.service"
 
 #define NOTIFICATION_WATCHER_DBUS_ADDR    "org.kde.StatusNotifierWatcher"
 #define NOTIFICATION_WATCHER_DBUS_OBJ     "/StatusNotifierWatcher"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 570cfe5..a2080bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,7 @@ check_PROGRAMS = \
 	test-simple-app
 
 TESTS =
-DISTCLEANFILES = $(TESTS)
+DISTCLEANFILES = $(TESTS) Makefile.in
 
 EXTRA_DIST = \
 	run-xvfb.sh \
@@ -37,7 +37,7 @@ test_libappindicator_CFLAGS = \
 
 test_libappindicator_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-dbus-client
@@ -54,7 +54,7 @@ test_libappindicator_dbus_client_CFLAGS = \
 
 test_libappindicator_dbus_client_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-dbus-server
@@ -71,7 +71,7 @@ test_libappindicator_dbus_server_CFLAGS = \
 
 test_libappindicator_dbus_server_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-status-client
@@ -88,7 +88,7 @@ test_libappindicator_status_client_CFLAGS = \
 
 test_libappindicator_status_client_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-status-server
@@ -105,7 +105,7 @@ test_libappindicator_status_server_CFLAGS = \
 
 test_libappindicator_status_server_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 #########################################
 ##  test-libappindicator-fallback
@@ -121,7 +121,7 @@ test_libappindicator_fallback_watcher_CFLAGS = \
 
 test_libappindicator_fallback_watcher_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 test_libappindicator_fallback_item_SOURCES = \
 	test-libappindicator-fallback-item.c
@@ -133,7 +133,7 @@ test_libappindicator_fallback_item_CFLAGS = \
 
 test_libappindicator_fallback_item_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la
 
 test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
 	@echo "#!/bin/bash" > $@
@@ -203,5 +203,5 @@ test_simple_app_CFLAGS = \
 
 test_simple_app_LDADD = \
 	$(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
-	$(top_builddir)/src/libappindicator$(VER).la
+	$(top_builddir)/src/libayatana-appindicator$(VER).la