diff --git a/src/plugins/nsspellchecker/nsspellcheckerdict.mm b/src/plugins/nsspellchecker/nsspellcheckerdict.mm
index f8d09e2..cdd7531 100644
--- a/src/plugins/nsspellchecker/nsspellcheckerdict.mm
+++ b/src/plugins/nsspellchecker/nsspellcheckerdict.mm
@@ -1,84 +1,105 @@
 /**
  * nsspellcheckerdict.mm
  *
  * Copyright (C)  2015  Nick Shaforostoff <shaforostoff@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
 #include "nsspellcheckerdict.h"
 #include "nsspellcheckerdebug.h"
 
 #import <AppKit/AppKit.h>
 
 using namespace Sonnet;
 
 NSSpellCheckerDict::NSSpellCheckerDict(const QString &lang)
     : SpellerPlugin(lang)
     , m_langCode(lang.toNSString())
 {
     if ([[NSSpellChecker sharedSpellChecker] setLanguage:reinterpret_cast<NSString*>(m_langCode)]) {
         qCDebug(SONNET_NSSPELLCHECKER) << "Loading dictionary for" << lang;
         [[NSSpellChecker sharedSpellChecker] updatePanels];
     } else {
         qCWarning(SONNET_NSSPELLCHECKER) << "Loading dictionary for unsupported language" << lang;
     }
 }
 
 NSSpellCheckerDict::~NSSpellCheckerDict()
 {
 }
 
 bool NSSpellCheckerDict::isCorrect(const QString &word) const
 {
-    NSRange range = [[NSSpellChecker sharedSpellChecker] checkSpellingOfString:word.toNSString()
+    NSString *nsWord = word.toNSString();
+    NSRange range = [[NSSpellChecker sharedSpellChecker] checkSpellingOfString:nsWord
         startingAt:0 language:reinterpret_cast<NSString*>(m_langCode)
         wrap:NO inSpellDocumentWithTag:0 wordCount:nullptr];
-    return range.length==0;
+    if (range.length == 0) {
+        // Check if the user configured a replacement text for this string. Sadly
+        // we can only signal an error if that's the case, Sonnet has no other way
+        // to take such substitutions into account.
+        NSDictionary *replacements = [[NSSpellChecker sharedSpellChecker] userReplacementsDictionary];
+        return [replacements objectForKey:nsWord] == nil;
+    }
+    return false;
 }
 
 QStringList NSSpellCheckerDict::suggest(const QString &word) const
 {
+    NSString *nsWord = word.toNSString();
     NSArray *suggestions = [[NSSpellChecker sharedSpellChecker] guessesForWordRange:NSMakeRange(0, word.length())
-        inString:word.toNSString() language:reinterpret_cast<NSString*>(m_langCode) inSpellDocumentWithTag:0];
+        inString:nsWord language:reinterpret_cast<NSString*>(m_langCode) inSpellDocumentWithTag:0];
     QStringList lst;
+    NSDictionary *replacements = [[NSSpellChecker sharedSpellChecker] userReplacementsDictionary];
+    QString replacement;
+    if ([replacements objectForKey:nsWord]) {
+        // return the replacement text from the userReplacementsDictionary first.
+        replacement = QString::fromNSString([replacements valueForKey:nsWord]);
+        lst << replacement;
+    }
     for (NSString *suggestion in suggestions) {
-        lst << QString::fromNSString(suggestion);
+        // the replacement text from the userReplacementsDictionary will be in
+        // the suggestions list; don't add it again.
+        QString str = QString::fromNSString(suggestion);
+        if (str != replacement) {
+            lst << str;
+        }
     }
     return lst;
 }
 
 bool NSSpellCheckerDict::storeReplacement(const QString &bad,
                                     const QString &good)
 {
     qCDebug(SONNET_NSSPELLCHECKER) << "Not storing replacement" << good << "for" << bad;
     return false;
 }
 
 bool NSSpellCheckerDict::addToPersonal(const QString &word)
 {
     NSString *nsWord = word.toNSString();
     if (![[NSSpellChecker sharedSpellChecker] hasLearnedWord:nsWord]) {
         [[NSSpellChecker sharedSpellChecker] learnWord:nsWord];
         [[NSSpellChecker sharedSpellChecker] updatePanels];
     }
     return true;
 }
 
 bool NSSpellCheckerDict::addToSession(const QString &word)
 {
     qCDebug(SONNET_NSSPELLCHECKER) << "Not storing" << word << "in the session dictionary";
     return false;
 }