diff --git a/manage b/manage
index a3ca20f..961a17d 100755
--- a/manage
+++ b/manage
@@ -7,12 +7,14 @@ usage() {
 Usage: $0 <command> [options]
 
 Commands:
-  help        Show this help message and exit
-  new <name>  Create a new song with the specified name
+  help         Show this help message and exit
+  new [name]   Create a new song [with the specified name]
+  edit <name>  Edit song with $EDITOR (taken from the EDITOR env var)
 
 Examples:
   $0 help
   $0 new [song-name]
+  $0 edit <song-name>
 
 EOF
   exit 1
@@ -43,6 +45,14 @@ case "$1" in
 		fi
 		create_new_song
 		;;
+	edit)
+		if [ "$#" -eq 2 ]; then
+			$EDITOR "content/$2/$2.cho"
+		else
+			echo -e "Missing song name\n"
+			usage
+		fi
+		;;
 	help)
 		usage
 		;;
diff --git a/readme.md b/readme.md
index 38cad7f..50bc451 100644
--- a/readme.md
+++ b/readme.md
@@ -40,9 +40,6 @@ The `manage` shell script lets you do basic song management and saves you some
 manual labour. Simply run the script itself or invoke `help` to get a list of
 all available commands.
 
-For now the script only supports creating new songs, which it does in an
-interactive way by asking for important data and filling all needed templates.
-
 ```
 ./manage help
 Usage: ./manage <command> [options]