diff --git a/features/core.feature b/features/core.feature
index 06afa2ac..61cba8c9 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -13,6 +13,19 @@ Feature: Basic reading and writing to a journal
             | But I'm better.
             """
 
+    Scenario: Printing a journal that has multiline entries
+        Given we use the config "multiline.yaml"
+        When we run "jrnl -n 1"
+        Then we should get no error
+        and the output should be
+            """
+            2013-06-09 15:39 Multiple line entry.
+            | This is the first line.
+            | This line doesn't have any ending punctuation
+            |
+            | There is a blank line above this.
+            """
+
     Scenario: Writing an entry from command line
         Given we use the config "basic.yaml"
         When we run "jrnl 23 july 2013: A cold and stormy day. I ate crisps on the sofa."
diff --git a/features/data/configs/multiline.yaml b/features/data/configs/multiline.yaml
new file mode 100644
index 00000000..aa35b3f5
--- /dev/null
+++ b/features/data/configs/multiline.yaml
@@ -0,0 +1,17 @@
+default_hour: 9
+default_minute: 0
+editor: ""
+encrypt: false
+highlight: true
+journals:
+  default: features/journals/multiline.journal
+linewrap: 80
+tagsymbols: "@"
+template: false
+timeformat: "%Y-%m-%d %H:%M"
+indent_character: "|"
+colors:
+  date: none
+  title: none
+  body: none
+  tags: none
diff --git a/features/data/journals/multiline.journal b/features/data/journals/multiline.journal
new file mode 100644
index 00000000..294ed141
--- /dev/null
+++ b/features/data/journals/multiline.journal
@@ -0,0 +1,5 @@
+[2013-06-09 15:39] Multiple line entry.
+This is the first line.
+This line doesn't have any ending punctuation
+
+There is a blank line above this.