diff --git a/inc/functions.php b/inc/functions.php
index b77ad54b..736b4892 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2017,7 +2017,7 @@ function markup(&$body, $track_cites = false, $op = false) {
 	print_err("Cites BEGIN");
 
 	// Cites
-	if (isset($board) && preg_match_all('/(^|\s)>>(\d+?)([\s,.)?]|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+	if (isset($board) && preg_match_all('/(^|\s)>>(\d+?)((?=[\s,.)?!])|$)/m', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
 		if (count($cites[0]) > $config['max_cites']) {
 			error($config['error']['toomanycites']);
 		}
@@ -2067,7 +2067,7 @@ function markup(&$body, $track_cites = false, $op = false) {
 	print_err("Cross board linking BEGIN");
 
 	// Cross-board linking
-	if (preg_match_all('/(^|\s)>>>\/(' . $config['board_regex'] . 'f?)\/(\d+)?([\s,.)?]|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+	if (preg_match_all('/(^|\s)>>>\/(' . $config['board_regex'] . 'f?)\/(\d+)?((?=[\s,.)?!])|$)/um', $body, $cites, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
 		if (count($cites[0]) > $config['max_cites']) {
 			error($config['error']['toomanycross']);
 		}