--- ./fpaste	2013-04-17 19:02:14.915972424 +1000
+++ ../fpaste-0.3.7.1/fpaste	2013-04-17 19:01:10.061175136 +1000
@@ -92,7 +92,7 @@
         if not confirm("Send binary data anyway?"):
             return False
 
-    req = urllib2.Request(url=FPASTE_URL, data=params, headers={'User-agent': USER_AGENT})
+    req = urllib2.Request(url=options.url, data=params, headers={'User-agent': USER_AGENT})
     if options.proxy:
         if options.debug:
             print >> sys.stderr, "Using proxy: %s" % options.proxy
@@ -118,9 +118,9 @@
 #            print j, k
     if options.make_private == 'yes':
         private_hash = [i[1]["hash"] for i in response.iteritems()].pop()
-        url = "{0}{1}/{2}".format(FPASTE_URL, id, private_hash)
+        url = "{0}{1}/{2}".format(options.url, id, private_hash)
     else:
-        url = "{0}{1}".format(FPASTE_URL, id)
+        url = "{0}{1}".format(options.url, id)
     return url
 
 #    url = f.geturl()
@@ -271,6 +271,7 @@
     fpasteOrg_group.add_option('-x', dest='expires', help='time before paste is removed; default is %default seconds; valid options: ' + ', '.join(validExpiresOpts), metavar='EXPIRES')
     #fpasteOrg_group.add_option('-P', dest='paste_private', help='make paste private; default is %default', + ', '.join(validPrivateOpts), metavar='"PRIVATE"')
     fpasteOrg_group.add_option('-P', '--private', help='make paste private; default is %default; valid options: ' + ', '.join(validPrivateOpts), dest='make_private', metavar='"PRIVATE"')
+    fpasteOrg_group.add_option('-U', '--URL', help='URL of fpaste server; default is %default', dest='url', metavar='"FPASTE URL"')
 
     parser.add_option_group(fpasteOrg_group)
     # other options
@@ -285,7 +286,7 @@
     fpasteProg_group.add_option('', '--confirm', dest='confirm', help='print paste, and prompt for confirmation before sending', action="store_true", default=False)
     parser.add_option_group(fpasteProg_group)
 
-    parser.set_defaults(desc='', nick='', lang='text', make_private='yes', expires=max(validExpiresOpts), selection='primary' )
+    parser.set_defaults(desc='', nick='', lang='text', make_private='yes', expires=max(validExpiresOpts), selection='primary', url=FPASTE_URL )
     (options, args) = parser.parse_args()
 
     if options.lang.lower() == 'list':