Index: JRSTReader.java
===================================================================
--- JRSTReader.java	(revision 545)
+++ JRSTReader.java	(working copy)
@@ -2092,8 +2092,8 @@
             int start = matcher.start();
             int end = matcher.end();
             Element ref = DocumentHelper.createElement(REFERENCE);
-            ref.addAttribute("refuri", matcher.group(2));
-            ref.setText(matcher.group(1));
+            ref.addAttribute("refuri", StringEscapeUtils.unescapeXml(matcher.group(2)));
+            ref.setText(StringEscapeUtils.unescapeXml(matcher.group(1)));
             String key = "inlineReference" + index++;
             temporaries.put(key, ref.asXML());
             text = text.substring(0, start) + "<tmp>" + key + "</tmp>"
Index: ReStructuredText.java
===================================================================
--- ReStructuredText.java	(revision 545)
+++ ReStructuredText.java	(working copy)
@@ -203,9 +203,9 @@
             .compile("\\*\\*(.+?)\\*\\*");
     public static final Pattern REGEX_LITERAL = Pattern.compile("``([^`]+)``");
     public static final Pattern REGEX_REFERENCE = Pattern
-            .compile("(https?://[-/%#[\\&&&[^(&gt;)]]\\._\\w:]+\\w+)((\\W|&|$)+)");
+    		.compile("(https?://[-/%#[\\&&&[^(&gt;)]]\\._\\w:]+\\w+)((\\W|&|$)+)");
     public static final Pattern REGEX_INLINE_REFERENCE = Pattern
-            .compile("`(.+) \\&lt\\;(https?://[-/%#&\\._\\w:]+)(\\&gt\\;)`_");
+            .compile("`(.+?) \\&lt\\;(https?://[-/%#&\\._\\w:[^ ]]+)(\\&gt\\;)`_");
     public static final Pattern REGEX_EMAIL = Pattern
             .compile("(^|[^_\\w])([-\\._\\w]+@[-\\._\\w]+)([^-\\._\\w]|$)");
     public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern