diff --git a/configure.in.in b/configure.in.in
index 65d6b1667..2d8c20e48 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -269,6 +269,7 @@ sample/valtest/Makefile
 sample/valtest/valtest.exe.config
 sample/opaquetest/Makefile
 sample/opaquetest/opaquetest.exe.config
+sample/gio/Makefile
 ])
 
 if test "x$enable_mono_cairo" = "xyes"; then
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 750e43f0b..94b951450 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -11,7 +11,6 @@ glue_includes = gio/gio.h
 POLICY_VERSIONS=
 
 sources =			\
-	AppInfoFactory.cs	\
 	FileFactory.cs		\
 	GioStream.cs
 
diff --git a/sample/Makefile.am b/sample/Makefile.am
index b96214f50..87f07ee99 100755
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = test GtkDemo pixmaps valtest opaquetest
+SUBDIRS = test GtkDemo pixmaps valtest opaquetest gio gtk-gio
 
 if ENABLE_MONO_CAIRO
 cairo_ref=-r:$(top_builddir)/cairo/Mono.Cairo.dll
diff --git a/sample/gio/AppInfo.cs b/sample/gio/AppInfo.cs
new file mode 100644
index 000000000..58346ac78
--- /dev/null
+++ b/sample/gio/AppInfo.cs
@@ -0,0 +1,30 @@
+using GLib;
+using System;
+
+namespace TestGio
+{
+	public class TestAppInfo
+	{
+		static void Main (string[] args)
+		{
+			if (args.Length != 1) {
+				Console.WriteLine ("Usage: TestAppInfo mimetype");
+				return;
+			}
+			GLib.GType.Init ();
+//			Gtk.Application.Init ();
+			Console.WriteLine ("Default Handler for {0}: {1}", args[0], AppInfoAdapter.GetDefaultForType (args[0], false).Name);
+			Console.WriteLine();
+			Console.WriteLine("List of all {0} handlers", args[0]);
+			foreach (AppInfo appinfo in AppInfoAdapter.GetAllForType (args[0]))
+				Console.WriteLine ("\t{0}: {1} {2}", appinfo.Name, appinfo.Executable, appinfo.Description);
+
+			AppInfo app_info = AppInfoAdapter.GetDefaultForType ("image/jpeg", false);
+			Console.WriteLine ("{0}:\t{1}", app_info.Name, app_info.Description);
+
+			Console.WriteLine ("All installed AppInfos:");
+			foreach (AppInfo appinfo in AppInfoAdapter.All)
+				Console.WriteLine ("\t{0}: {1} ", appinfo.Name, appinfo.Executable);
+		}
+	}
+}
diff --git a/sample/gio/Makefile.am b/sample/gio/Makefile.am
new file mode 100755
index 000000000..fee571d93
--- /dev/null
+++ b/sample/gio/Makefile.am
@@ -0,0 +1,19 @@
+TARGETS = AppInfo.exe 
+
+DEBUGS = $(addsuffix .mdb, $(TARGETS))
+
+assemblies = 					\
+	$(top_builddir)/glib/glib-sharp.dll 	\
+	$(top_builddir)/gio/gio-sharp.dll 
+
+references=$(addprefix /r:, $(assemblies))
+
+noinst_SCRIPTS = $(TARGETS)
+CLEANFILES = $(TARGETS) $(DEBUGS)
+
+.cs.exe: $(assemblies)
+	$(CSC) /out:$@ $(references) $<
+
+EXTRA_DIST = 				\
+	AppInfo.cs
+