diff --git a/ChangeLog b/ChangeLog
index a2d9a9fa..d9aaca87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-09  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
+
+    * programs/common.c
+    Accept "ogg" as a file extention for Ogg/Vorbis files.
+
 2012-06-22  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * src/flac.c
diff --git a/programs/common.c b/programs/common.c
index c0d3221f..d497ec97 100644
--- a/programs/common.c
+++ b/programs/common.c
@@ -311,6 +311,7 @@ static OUTPUT_FORMAT_MAP format_map [] =
 	{	"xi",		0, 	SF_FORMAT_XI 	},
 	{	"wve",		0,	SF_FORMAT_WVE	},
 	{	"oga",		0,	SF_FORMAT_OGG	},
+	{	"ogg",		0,	SF_FORMAT_OGG	},
 	{	"mpc",		0,	SF_FORMAT_MPC2K	},
 	{	"rf64",		0,	SF_FORMAT_RF64	},
 } ; /* format_map */