diff --git a/libpod/container_log.go b/libpod/container_log.go
index c3a84d048a..39c395fe65 100644
--- a/libpod/container_log.go
+++ b/libpod/container_log.go
@@ -2,6 +2,7 @@ package libpod
 
 import (
 	"os"
+	"time"
 
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/logs"
@@ -72,5 +73,27 @@ func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *l
 		}
 		options.WaitGroup.Done()
 	}()
+	// Check if container is still running or paused
+	go func() {
+		if options.Follow {
+			for {
+				state, err := c.State()
+				if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
+					logrus.Error(err)
+					break
+				} else if err != nil {
+					break
+				}
+				if state != define.ContainerStateRunning && state != define.ContainerStatePaused {
+					err := t.Stop()
+					if err != nil {
+						logrus.Error(err)
+					}
+					break
+				}
+				time.Sleep(1 * time.Second)
+			}
+		}
+	}()
 	return nil
 }
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index f36163ccc0..f9446e0c64 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -288,4 +288,16 @@ var _ = Describe("Podman logs", func() {
 		logc.WaitWithDefaultTimeout()
 		Expect(logc).To(Exit(0))
 	})
+
+	It("follow output stopped container", func() {
+		containerName := "logs-f"
+
+		logc := podmanTest.Podman([]string{"run", "--name", containerName, "-d", ALPINE})
+		logc.WaitWithDefaultTimeout()
+		Expect(logc).To(Exit(0))
+
+		results := podmanTest.Podman([]string{"logs", "-f", containerName})
+		results.WaitWithDefaultTimeout()
+		Expect(results).To(Exit(0))
+	})
 })