Index: trunk/cd2flac
===================================================================
--- trunk/cd2flac	(revision 38)
+++ trunk/cd2flac	(revision 41)
@@ -37,11 +37,7 @@
 $CD_DEVICE ||= '/dev/cdrom';
 
+my $tags = $BARCODE ? { BARCODE => $BARCODE } : {};
 my $ripper = Ripper->new({ device => $CD_DEVICE });
-$ripper->rip_to_flac($archive_flac);
-
-if ($BARCODE) {
-    print "Writing barcode\n";
-    system 'metaflac', '--set-tag', "BARCODE=$BARCODE", $archive_flac;
-}
+$ripper->rip_to_flac($archive_flac, $tags);
 
 print "Rip saved as $archive_flac\n";