--- freelinking.module	2007-02-17 07:47:39.000000000 -0500
+++ freelinking.module	2007-07-03 18:33:08.000000000 -0400
@@ -275,7 +275,8 @@ function _freelinking_do_filtering($text
          $replacement = '<a class="freelinking external" href="' . $freelink . '">' . $phrase . '</a>';
       }
       else {
-        $replacement = l($phrase, 'freelinking/' . rawurlencode($freelink), array('class' => 'freelinking'));
+        $thereallink = _freelinking_make_link($phrase);
+        $replacement = l($phrase, $thereallink['path'], array('class' => 'freelinking'));
       }
     }
 
@@ -283,7 +284,8 @@ function _freelinking_do_filtering($text
       $pattern = '/\b' . $wikiword . '\b(?![^<]*>)/';
       $phrase = $wikiword; // consistency for the db
       $freelink = $wikiword; // also for the db
-      $replacement = l($wikiword, 'freelinking/' . urlencode($wikiword));
+      $thereallink = _freelinking_make_link($wikiword);
+      $replacement = l($wikiword, $thereallink['path']);
     }
     $text = preg_replace($pattern, $replacement, $text, variable_get("freelinking_onceonly", 0) ? 1 : -1);