--- tagtool.module.orig	2008-10-07 09:35:59.000000000 -0500
+++ tagtool.module	2008-11-28 21:27:22.000000000 -0600
@@ -138,8 +138,7 @@
       return $tags;
     case 'Custom tags':
       if($custom = variable_get('tagtool_custom_'.$vid, '')){
-        $custom = str_replace("\n", '', $custom);
-        $tokens = preg_split('/[,\s]+/', $custom, -1, PREG_SPLIT_NO_EMPTY);
+        $tokens = preg_split('/[,]|[\n\r]/', $custom, -1, PREG_SPLIT_NO_EMPTY);
         $tags = array();
         foreach($tokens as $t){
           if($t[0] == '#'){