diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index 5b9bd3ec..0c928dc4 100644
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -22,6 +22,7 @@ SOURCES =  \
 	SparkleHelpers.cs \
 	SparkleListenerBase.cs \
 	SparkleListenerIrc.cs \
+        SparkleListenerTcp.cs \
 	SparkleOptions.cs \
 	SparklePaths.cs \
 	SparkleRepoBase.cs \
diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs
new file mode 100644
index 00000000..027d0ed1
--- /dev/null
+++ b/SparkleLib/SparkleListenerTcp.cs
@@ -0,0 +1,155 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//
+//   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 3 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, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Net.Sockets;
+using System.Security.Cryptography;
+
+namespace SparkleLib {
+
+    public class SparkleListenerTcp : SparkleListenerBase {
+
+        private Thread thread;
+        private Socket socket;
+
+        public SparkleListenerTcp (string server, string folder_identifier, string announcements) :
+            base (server, folder_identifier, announcements)
+        {
+            base.server = server;
+            base.channels.Add (folder_identifier);
+            this.socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+/*
+            this.client.OnConnected += delegate {
+                base.is_connecting = false;
+                OnConnected ();
+            };
+
+            this.client.OnDisconnected += delegate {
+                base.is_connecting = false;
+                OnDisconnected ();
+            };
+
+            this.client.OnError += delegate {
+                base.is_connecting = false;
+                OnDisconnected ();
+            };
+
+            this..OnChannelMessage += delegate (object o, IrcEventArgs args) {
+                string message = args.Data.Message.Trim ();
+                string folder_id = args.Data.Channel.Substring (1); // remove the starting hash
+                OnAnnouncement (new SparkleAnnouncement (folder_id, message));
+            };*/
+        }
+
+
+        public override bool IsConnected {
+            get {
+              //return this.client.IsConnected;
+              return true;
+            }
+        }
+
+
+        // Starts a new thread and listens to the channel
+        public override void Connect ()
+        {
+            SparkleHelpers.DebugInfo ("ListenerTcp", "Connecting to " + Server);
+
+            base.is_connecting = true;
+
+            this.thread = new Thread (
+                new ThreadStart (delegate {
+                    try {
+
+                        // Connect and subscribe to the channel
+                        this.socket.Connect (Server, 9999);
+                        base.is_connecting = false;
+
+                        foreach (string channel in base.channels) {
+                            SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
+
+                            byte [] message = Encoding.UTF8.GetBytes (
+                                "{\"folder\": \"" + channel + "\", \"command\": \"subscribe\"}");
+                            this.socket.Send (message);
+                        }
+
+                        byte [] bytes = new byte [4096];
+
+                        // List to the channels, this blocks the thread
+                        while (this.socket.Connected) {
+                            this.socket.Receive (bytes);
+                            if (bytes != null && bytes.Length > 0) {
+                                Console.WriteLine (Encoding.UTF8.GetString (bytes));
+
+                                string received_message = bytes.ToString ().Trim ();
+                                string folder_id = ""; // TODO: parse message, use XML
+                                OnAnnouncement (new SparkleAnnouncement (folder_id, received_message));
+                            }
+                        }
+
+                        // Disconnect when we time out
+                        this.socket.Close ();
+
+                    } catch (SocketException e) {
+                        SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message);
+                    }
+                })
+            );
+
+            this.thread.Start ();
+        }
+
+
+        public override void AlsoListenTo (string folder_identifier)
+        {
+            string channel = folder_identifier;
+            if (!base.channels.Contains (channel)) {
+                base.channels.Add (channel);
+
+                if (IsConnected) {
+                    SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
+
+                    byte [] message = Encoding.UTF8.GetBytes (
+                        "{\"folder\": \"" + channel + "\", \"command\": \"subscribe\"}");
+                    this.socket.Send (message);
+                }
+            }
+        }
+
+
+        public override void Announce (SparkleAnnouncement announcement)
+        {
+            string channel = announcement.FolderIdentifier;
+            byte [] message = Encoding.UTF8.GetBytes (
+               "{\"folder\": \"" + channel + "\", \"command\": \"publish\"}");
+            this.socket.Send (message);
+
+            // Also announce to ourselves for debugging purposes
+            // base.OnAnnouncement (announcement);
+        }
+
+
+        public override void Dispose ()
+        {
+            this.thread.Abort ();
+            this.thread.Join ();
+            base.Dispose ();
+        }
+    }
+}