diff --git a/README.md b/README.md
index 1bd2b3fc..a133099e 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ At the moment OnionShare is a command line program. It works in Mac OS X, GNU/Li
 
 You can also install onionshare by using pip or easy_install. On pip you can type `pip install onionshare` and on easy_install your can use `easy_install onionshare`.
 
-OnionShare relies on Tor. You need to either have a system Tor installed (`sudo apt-get install tor`), or you can open Tor Browser so that OnionShare can use the Tor server provided there. Start Tor, and then run `onionshare.py`, passing in the file that you want to share, like this:
+OnionShare relies on Tor. You need to either have a system Tor installed (`sudo apt-get install tor`), or you can open Tor Browser so that OnionShare can use the Tor server provided there. Start Tor, and then run `onionshare`, passing in the file that you want to share, like this:
 
-    [user@dev onionshare]$ ./onionshare.py ~/Desktop/secrets.pdf
+    [user@dev onionshare]$ ./onionshare ~/Desktop/secrets.pdf
     Connecting to Tor ControlPort to set up hidden service on port 26828
 
     Give this URL to the person you're sending the file to:
@@ -32,9 +32,9 @@ Securely send the URL to the person you are sending the file to (like by using J
 
 OnionShare isn't properly packaged for Windows yet. This means you'll need to install Python 2.x yourself. [Download the latest 2.x version of python](https://www.python.org/downloads/) for your architecture and install it. Your python binary should be something like `C:\Python27\python.exe`.
 
-Since OnionShare is a command line program, and using it involves copying and pasting a URL from a command prompt window, it's less frusturating if you use the Windows PowerShell rather than the Command Prompt (in PowerShell, select text you want to copy and then right-click to copy it onto the clipboard). But you can use either. Open either PowerShell or a Command Prompt, cd to your onionshare folder, and run `python.exe onionshare.py` with the path to the file you want to share. For example:
+Since OnionShare is a command line program, and using it involves copying and pasting a URL from a command prompt window, it's less frusturating if you use the Windows PowerShell rather than the Command Prompt (in PowerShell, select text you want to copy and then right-click to copy it onto the clipboard). But you can use either. Open either PowerShell or a Command Prompt, cd to your onionshare folder, and run `python.exe onionshare` with the path to the file you want to share. For example:
 
-    PS C:\Users\user\Desktop\onionshare> C:\Python27\python.exe onionshare.py C:\Users\user\Desktop\secrets.pdf
+    PS C:\Users\user\Desktop\onionshare> C:\Python27\python.exe onionshare C:\Users\user\Desktop\secrets.pdf
     Connecting to Tor ControlPort to set up hidden service on port 40867
 
     Give this URL to the person you're sending the file to:
@@ -52,7 +52,7 @@ Since OnionShare is a command line program, and using it involves copying and pa
 
 ## Using OnionShare in Tails
 
-You need to run OnionShare as root in Tails, so make sure you set an administrator password when you boot Tails. Follow the same instructions as above, except run `onionshare-tails` instead of `onionshare.py`, and run it with sudo like this:
+You need to run OnionShare as root in Tails, so make sure you set an administrator password when you boot Tails. Follow the same instructions as above, except run `onionshare-tails` instead of `onionshare`, and run it with sudo like this:
 
     amnesia@amnesia:~/Persistent/code/onionshare$ sudo ./onionshare-tails ~/Persistent/file_to_send.pgp
     [sudo] password for amnesia:
diff --git a/onionshare.py b/onionshare
similarity index 100%
rename from onionshare.py
rename to onionshare
diff --git a/onionshare-tails b/onionshare-tails
index 7d654679..4e0b415f 100755
--- a/onionshare-tails
+++ b/onionshare-tails
@@ -8,5 +8,5 @@ fi
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 export ONIONSHARE_PLATFORM=Tails
-$DIR/onionshare.py $@
+$DIR/onionshare $@