5 files changed, 35 insertions, 4 deletions
diff --git a/src/error.cc b/src/error.cc
index 58339db7..8aa1d3d6 100644
--- a/src/error.cc
+++ b/src/error.cc
@@ -84,7 +84,7 @@ string source_context(const path&            file,
                       const string&          prefix)
 {
   const std::streamoff len = end_pos - pos;
-  if (! len || file == path("/dev/stdin"))
+  if (! len || file.empty())
     return _("<no source context>");
 
   assert(len > 0);
diff --git a/src/item.cc b/src/item.cc
index 362fac7f..4e2a487c 100644
--- a/src/item.cc
+++ b/src/item.cc
@@ -582,8 +582,8 @@ string item_context(const item_t& item, const string& desc)
 
   std::ostringstream out;
 
-  if (item.pos->pathname == path("/dev/stdin")) {
-    out << desc << _(" from standard input:");
+  if (item.pos->pathname.empty()) {
+    out << desc << _(" from streamed input:");
     return out.str();
   }
 
diff --git a/src/session.cc b/src/session.cc
index b6153203..f047a540 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -143,7 +143,7 @@ std::size_t session_t::read_data(const string& master_account)
     }
 
     foreach (const path& pathname, HANDLER(file_).data_files) {
-      if (pathname == "-") {
+      if (pathname == "-" || pathname == "/dev/stdin") {
         // To avoid problems with stdin and pipes, etc., we read the entire
         // file in beforehand into a memory buffer, and then parcel it out
         // from there.
diff --git a/test/regress/BF3C1F82-2.test b/test/regress/BF3C1F82-2.test
new file mode 100644
index 00000000..453151ce
--- /dev/null
+++ b/test/regress/BF3C1F82-2.test
@@ -0,0 +1,12 @@
+; Check that include directives are relative for "-f /dev/stdin"
+include non-existent-ledger-file-BF3C1F82
+test -f - reg -> 1
+__ERROR__
+While parsing file "", line 2: 
+Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+end test
+test -f /dev/stdin reg -> 1
+__ERROR__
+While parsing file "", line 2: 
+Error: File to include was not found: "./non-existent-ledger-file-BF3C1F82"
+end test
diff --git a/test/regress/BF3C1F82.test b/test/regress/BF3C1F82.test
new file mode 100644
index 00000000..50f4106f
--- /dev/null
+++ b/test/regress/BF3C1F82.test
@@ -0,0 +1,19 @@
+; Check that error reporting works for "-f -"
+
+2012/02/30 * Test
+  a  1
+  b
+test -f - reg -> 1
+__ERROR__
+While parsing file "", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test
+test -f /dev/stdin reg -> 1
+__ERROR__
+While parsing file "", line 3: 
+While parsing transaction:
+<no source context>
+Error: Day of month is not valid for year
+end test