diff --git a/src/vs/base/parts/ipc/common/ipc.electron.ts b/src/vs/base/parts/ipc/common/ipc.electron.ts
new file mode 100644
index 00000000000..5712b4082e6
--- /dev/null
+++ b/src/vs/base/parts/ipc/common/ipc.electron.ts
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { Server as IPCServer, Client as IPCClient, IServer, IClient, IChannel } from 'vs/base/parts/ipc/common/ipc';
+
+const Hello = 'ipc:hello';
+const Goodbye = 'ipc:goodbye';
+const Message = 'ipc:message';
+
+export interface IPC extends NodeJS.EventEmitter {
+	send(channel: string, ...args: any[]): void;
+}
+
+class Protocol implements IMessagePassingProtocol {
+
+	private listener: IDisposable;
+
+	constructor(private ipc: IPC) {}
+
+	send(message: any): void {
+		this.ipc.send(Message, message);
+	}
+
+	onMessage(callback: (message: any) => void): void {
+		const cb = (_, m) => callback(m);
+		this.ipc.on(Message, cb);
+		this.listener = toDisposable(() => this.ipc.removeListener(Message, cb));
+	}
+
+	dispose(): void {
+		this.listener = dispose(this.listener);
+	}
+}
+
+export class Server implements IServer, IDisposable {
+
+	private channels: { [name: string]: IChannel };
+
+	constructor(ipc: IPC) {
+		this.channels = Object.create(null);
+
+		ipc.on(Hello, ({ sender }) => {
+			const protocol = new Protocol(sender);
+			const ipcServer = new IPCServer(protocol);
+
+			Object.keys(this.channels)
+				.forEach(name => ipcServer.registerChannel(name, this.channels[name]));
+
+			sender.once(Goodbye, () => {
+				ipcServer.dispose();
+				protocol.dispose();
+			});
+
+			sender.send(Hello);
+		});
+	}
+
+	registerChannel(channelName: string, channel: IChannel): void {
+		this.channels[channelName] = channel;
+	}
+
+	dispose(): void {
+		this.channels = null;
+	}
+}
+
+export class Client implements IClient, IDisposable {
+
+	private protocol: Protocol;
+	private ipcClient: IPCClient;
+
+	constructor(private ipc: IPC) {
+		this.protocol = new Protocol(ipc);
+		this.ipcClient = new IPCClient(this.protocol);
+	}
+
+	getChannel<T extends IChannel>(channelName: string): T {
+		return this.ipcClient.getChannel(channelName) as T;
+	}
+
+	dispose(): void {
+		this.ipc.send(Goodbye);
+		this.protocol = dispose(this.protocol);
+	}
+}
+
+export function connect(ipc: IPC): TPromise<Client> {
+	return new TPromise<Client>((c, e) => {
+		ipc.once(Hello, () => {
+			ipc.removeListener('error', e);
+			c(new Client(ipc));
+		});
+
+		ipc.once('error', e);
+		ipc.send(Hello);
+	});
+}
\ No newline at end of file