diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 51d85fe..f1d7541 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -217,8 +217,8 @@ namespace :redmine do
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
 
-	# Links to pages UsingJustCaps
-	text = text.gsub(/[^!]\b([A-Z][a-z]+[A-Z][a-zA-Z]+)/, ' [[\1]]')
+	# Links to pages UsingJustWikiCaps
+	text = text.gsub(/([^!]|^)(^| )([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')
 	# Normalize things that were supposed to not be links
 	# like !NotALink
 	text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')