diff --git a/README.md b/README.md
index 1b38c2b..7e2ea01 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,15 @@ cat file | haste
 haste file
 ```
 
+## You can get the raw version
+
+Want the raw URL returned instead? (a plain-text version)?
+
+``` bash
+cat file | haste --raw # or
+haste file --raw
+```
+
 ## Changing the location of your haste server
 
 By default, haste will point at `http://hastebin.com`.  You can change this by setting the value of `ENV['HASTE_SERVER']` to the URL of your haste server.  You can also use `alias` to make easy shortcuts if you commonly use a few hastes intermingled with each other.  To do that, you'd put something like this into ~.bash_profile:
diff --git a/lib/haste/cli.rb b/lib/haste/cli.rb
index 9f690ed..f6611e4 100644
--- a/lib/haste/cli.rb
+++ b/lib/haste/cli.rb
@@ -10,13 +10,18 @@ module Haste
     # And then handle the basic usage
     def start
       # Take data in
-      key = if STDIN.tty?
-        @uploader.upload_path ARGV.first
+      if STDIN.tty?
+        key = @uploader.upload_path ARGV.first
       else
-        @uploader.upload_raw STDIN.readlines.join
+        key = @uploader.upload_raw STDIN.readlines.join
+      end
+      # Put together a URL
+      if ARGV.include?('--raw')
+        url = "#{@uploader.server_url}/raw/#{key}"
+      else
+        url = "#{@uploader.server_url}/#{key}"
       end
       # And write data out
-      url = "#{@uploader.server_url}/#{key}"
       if STDOUT.tty?
         STDOUT.puts url
       else