diff --git a/se/sics/mspsim/cli/LineOutputStream.java b/se/sics/mspsim/cli/LineOutputStream.java
new file mode 100644
index 0000000..663aad9
--- /dev/null
+++ b/se/sics/mspsim/cli/LineOutputStream.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of MSPSim.
+ *
+ * $Id: $
+ *
+ * -----------------------------------------------------------------
+ *
+ * LineOutputStream
+ *
+ * Author  : Joakim Eriksson
+ * Created : 8 mar 2008
+ * Updated : $Date:$
+ *           $Revision:$
+ */
+package se.sics.mspsim.cli;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * @author joakim
+ *
+ */
+public class LineOutputStream extends OutputStream {
+
+  private StringBuilder line = new StringBuilder();
+  private LineListener listener;
+  
+  public LineOutputStream(LineListener listener) {
+    this.listener = listener;
+  }
+  /* Buffers and calls line listener when a line is complete
+   * @see java.io.OutputStream#write(int)
+   */
+  @Override
+  public void write(int c) throws IOException {
+    if (c == '\n') {
+      listener.lineRead(line.toString());
+      line.setLength(0);
+    } else {
+      line.append((char) c);
+    }
+  }
+}