diff --git a/inc/functions.php b/inc/functions.php
index 229c09b2..951a69a8 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1215,7 +1215,7 @@
 		}
 
 		// Cites
-		if(isset($board) && preg_match_all('/(^|\s)>>(\d+?)(\s|$)/', $body, $cites)) {
+		if(isset($board) && preg_match_all('/(^|\s)>>(\d+?)([\s,.]|$)/', $body, $cites)) {
 			if(count($cites[0]) > $config['max_cites']) {
 				error($config['error']['toomanycites']);
 			}
@@ -1237,7 +1237,7 @@
 		}
 		
 		// Cross-board linking
-		if(preg_match_all('/(^|\s)>>>\/(\w+?)\/(\d+)?(\s|$)/', $body, $cites)) {
+		if(preg_match_all('/(^|\s)>>>\/(\w+?)\/(\d+)?([\s,.]|$)/', $body, $cites)) {
 			if(count($cites[0]) > $config['max_cites']) {
 				error($config['error']['toomanycross']);
 			}