diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index 9b1884611a..e550f15834 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -122,14 +122,14 @@ if( $mode != "" )
 		if( $word_id )
 		{
 			$sql = "UPDATE " . WORDS_TABLE . " 
-				SET word = '$word', replacement = '$replacement' 
+				SET word = '" . str_replace("\'", "''", $word) . "', replacement = '" . str_replace("\'", "''", $replacement) . "' 
 				WHERE word_id = $word_id";
 			$message = $lang['Word_updated'];
 		}
 		else
 		{
 			$sql = "INSERT INTO " . WORDS_TABLE . " (word, replacement) 
-				VALUES ('$word', '$replacement')";
+				VALUES ('" . str_replace("\'", "''", $word) . "', '" . str_replace("\'", "''", $replacement) . "')";
 			$message = $lang['Word_added'];
 		}