diff --git a/src/com/atlassian/uwc/converters/mediawiki/UserDateConverter.java b/src/com/atlassian/uwc/converters/mediawiki/UserDateConverter.java
index 6c78a6e..4ca8a56 100644
--- a/src/com/atlassian/uwc/converters/mediawiki/UserDateConverter.java
+++ b/src/com/atlassian/uwc/converters/mediawiki/UserDateConverter.java
@@ -33,7 +33,7 @@
 		log.debug("Adding User and Date metadata - Complete");
 	}
 	
-	Pattern username = Pattern.compile("^\\{user:([^}]*)\\}\n");
+	Pattern username = Pattern.compile("^\\{user:([^}]*)\\}\r?\n");
 	public String getUser(String input) {
 		Matcher userFinder = username.matcher(input);
 		if (userFinder.find()) {
@@ -42,7 +42,7 @@
 		return null;
 	}
 
-	protected Pattern date = Pattern.compile("(?:\n|^)\\{timestamp:([^}]*)\\}\n");
+	protected Pattern date = Pattern.compile("(?:\n|^)\\{timestamp:([^}]*)\\}\r?\n");
 	protected Date getDate(String input) {
 		Matcher dateFinder = date.matcher(input);
 		if (dateFinder.find()) {