diff --git a/ChangeLog b/ChangeLog
index c3b4298..2c30a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/rip/cd.py:
+	  Add -U/--unknown option to continue ripping even if the CD is
+	  unknown.  Default to False.
+
 2010-12-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/program.py:
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 8b64811..a082976 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -87,6 +87,11 @@ Discs are named according to the disc template:
             help="profile for encoding (default '%s', choices '%s')" % (
                 default, "', '".join(encode.PROFILES.keys())),
             default=default)
+        self.parser.add_option('-U', '--unknown',
+            action="store_true", dest="unknown",
+            help="whether to continue ripping if the CD is unknown (%default)",
+            default=False)
+        default = 'flac'
 
 
     def handleOptions(self, options):
@@ -132,6 +137,9 @@ See  http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=1
 
         prog.metadata = prog.getMusicBrainz(ittoc, mbdiscid)
 
+        if not prog.metadata and not self.options.unknown:
+            return -1
+
         # now, read the complete index table, which is slower
         itable = prog.getTable(runner, ittoc.getCDDBDiscId(), device)