diff --git a/bin/geomag.py b/bin/geomag.py
index de9d1387db84af32ae7dbd0ddf283010f8fed2fe..283c5fc6feb37fb629b1cac5fd73829c45feb583 100755
--- a/bin/geomag.py
+++ b/bin/geomag.py
@@ -65,6 +65,12 @@ def main():
                 observatory=args.observatory,
                 type=args.type,
                 interval=args.interval)
+    elif args.input_pcdcp_stdin:
+        inputfactory = pcdcp.StreamPCDCPFactory(
+                stream=sys.stdin,
+                observatory=args.observatory,
+                type=args.type,
+                interval=args.interval)
     else:
         print >> sys.stderr, 'Missing required input directive.'
 
@@ -148,6 +154,9 @@ def parse_args():
             help='Pass in an iaga file using redirection from stdin.')
     input_group.add_argument('--input-iaga-url',
             help='Example: file://./%%(obs)s%%(ymd)s%%(t)s%%(i)s.%%(i)s')
+    input_group.add_argument('--input-pcdcp-stdin',
+            action='store_true', default=False,
+            help='Pass in an pcdcp file using redirection from stdin.')
 
     # Output group
     output_group = parser.add_mutually_exclusive_group(required=True)
@@ -165,6 +174,9 @@ def parse_args():
             choices=['geo', 'mag', 'obs', 'obsd'],
             help='Enter the geomagnetic orientation(s) you want to read from' +
                     ' and to respectfully.')
+    output_group.add_argument('--output-pcdcp-stdout',
+            action='store_true', default=False,
+            help='Write to stdout')
 
     return parser.parse_args()