diff --git a/server.go b/server.go
index 6129e3eb9..d275fe814 100644
--- a/server.go
+++ b/server.go
@@ -1044,20 +1044,39 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
 	//logs
 	if logs {
 		cLog, err := container.ReadLog("json")
-		if err != nil {
-			utils.Debugf("Error reading logs (json): %s", err)
-		}
-		dec := json.NewDecoder(cLog)
-		for {
-			var l utils.JSONLog
-			if err := dec.Decode(&l); err == io.EOF {
-				break
-			} else if err != nil {
-				utils.Debugf("Error streaming logs: %s", err)
-				break
+		if err != nil && os.IsNotExist(err) {
+			// Legacy logs
+			if stdout {
+				cLog, err := container.ReadLog("stdout")
+				if err != nil {
+					utils.Debugf("Error reading logs (stdout): %s", err)
+				} else if _, err := io.Copy(out, cLog); err != nil {
+					utils.Debugf("Error streaming logs (stdout): %s", err)
+				}
 			}
-			if (l.Stream == "stdout" && stdout) || (l.Stream == "stderr" && stderr) {
-				fmt.Fprintf(out, "%s", l.Log)
+			if stderr {
+				cLog, err := container.ReadLog("stderr")
+				if err != nil {
+					utils.Debugf("Error reading logs (stderr): %s", err)
+				} else if _, err := io.Copy(out, cLog); err != nil {
+					utils.Debugf("Error streaming logs (stderr): %s", err)
+				}
+			}
+		} else if err != nil {
+			utils.Debugf("Error reading logs (json): %s", err)
+		} else {
+			dec := json.NewDecoder(cLog)
+			for {
+				var l utils.JSONLog
+				if err := dec.Decode(&l); err == io.EOF {
+					break
+				} else if err != nil {
+					utils.Debugf("Error streaming logs: %s", err)
+					break
+				}
+				if (l.Stream == "stdout" && stdout) || (l.Stream == "stderr" && stderr) {
+					fmt.Fprintf(out, "%s", l.Log)
+				}
 			}
 		}
 	}