diff --git a/bin/tftpy_client.py b/bin/tftpy_client.py
index 039e7d3..98758b6 100755
--- a/bin/tftpy_client.py
+++ b/bin/tftpy_client.py
@@ -29,10 +29,10 @@ def main():
                       default=512)
     parser.add_option('-o',
                       '--output',
-                      help='output file (default: same as requested filename)')
+                      help='output file, - for stdout (default: same as download)')
     parser.add_option('-i',
                       '--input',
-                      help='input file (default: same as upload filename)')
+                      help='input file, - for stdin (default: same as upload)')
     parser.add_option('-d',
                       '--debug',
                       action='store_true',
diff --git a/tftpy/TftpClient.py b/tftpy/TftpClient.py
index 5bf4658..afe1bf0 100644
--- a/tftpy/TftpClient.py
+++ b/tftpy/TftpClient.py
@@ -33,7 +33,9 @@ class TftpClient(TftpSession):
         copy of each DAT packet received in the form of a TftpPacketDAT
         object. The timeout parameter may be used to override the default
         SOCK_TIMEOUT setting, which is the amount of time that the client will
-        wait for a receive packet to arrive."""
+        wait for a receive packet to arrive.
+
+        Note: If output is a hyphen then stdout is used."""
         # We're downloading.
         log.debug("Creating download context with the following params:")
         log.debug("host = %s, port = %s, filename = %s, output = %s"
@@ -64,6 +66,7 @@ class TftpClient(TftpSession):
         log.info("Received %d duplicate packets" % metrics.dupcount)
 
     def upload(self, filename, input, packethook=None, timeout=SOCK_TIMEOUT):
+        """Note: If input is a hyphen then stdin is used."""
         # Open the input file.
         # FIXME: As of the state machine, this is now broken. Need to
         # implement with new state machine.
diff --git a/tftpy/TftpStates.py b/tftpy/TftpStates.py
index f99d7c9..a53fc01 100644
--- a/tftpy/TftpStates.py
+++ b/tftpy/TftpStates.py
@@ -1,7 +1,7 @@
 from TftpShared import *
 from TftpPacketTypes import *
 from TftpPacketFactory import *
-import socket, time, os
+import socket, time, os, sys
 
 ###############################################################################
 # Utility classes
@@ -223,7 +223,8 @@ class TftpContextServer(TftpContext):
         self.metrics.compute()
 
 class TftpContextClientUpload(TftpContext):
-    """The upload context for the client during an upload."""
+    """The upload context for the client during an upload.
+    Note: If input is a hyphen, then we will use stdin."""
     def __init__(self,
                  host,
                  port,
@@ -239,7 +240,10 @@ class TftpContextClientUpload(TftpContext):
         self.file_to_transfer = filename
         self.options = options
         self.packethook = packethook
-        self.fileobj = open(input, "rb")
+        if input == '-':
+            self.fileobj = sys.stdin
+        else:
+            self.fileobj = open(input, "rb")
 
         log.debug("TftpContextClientUpload.__init__()")
         log.debug("file_to_transfer = %s, options = %s" %
@@ -278,7 +282,8 @@ class TftpContextClientUpload(TftpContext):
         self.metrics.compute()
 
 class TftpContextClientDownload(TftpContext):
-    """The download context for the client during a download."""
+    """The download context for the client during a download.
+    Note: If output is a hyphen, then the output will be sent to stdout."""
     def __init__(self,
                  host,
                  port,
@@ -297,7 +302,11 @@ class TftpContextClientDownload(TftpContext):
         self.packethook = packethook
         # FIXME - need to support alternate return formats than files?
         # File-like objects would be ideal, ala duck-typing.
-        self.fileobj = open(output, "wb")
+        # If the filename is -, then use stdout
+        if output == '-':
+            self.fileobj = sys.stdout
+        else:
+            self.fileobj = open(output, "wb")
 
         log.debug("TftpContextClientDownload.__init__()")
         log.debug("file_to_transfer = %s, options = %s" %