diff -Nurd -x'*~' aspell-0.60.5.orig/Makefile.in aspell-0.60.5/Makefile.in
--- aspell-0.60.5.orig/Makefile.in	2006-12-19 06:03:37.000000000 -0500
+++ aspell-0.60.5/Makefile.in	2008-01-31 02:10:11.000000000 -0500
@@ -486,7 +486,7 @@
 AM_CPPFLAGS = -I${srcdir}/gen -I${srcdir}/common \
 	-I${srcdir}/interfaces/cc/ \
 	-I${srcdir}/modules/speller/default/ \
-	-DLOCALEDIR="$(localedir)"
+	-DLOCALEDIR="\"$(localedir)\""
 SUFFIXES = .info
 
 ### Before this line add the corresponding <yourfilterlibrary>_SOURCES and
diff -Nurd -x'*~' aspell-0.60.5.orig/common/gettext.h aspell-0.60.5/common/gettext.h
--- aspell-0.60.5.orig/common/gettext.h	2004-11-20 21:52:22.000000000 -0500
+++ aspell-0.60.5/common/gettext.h	2008-01-31 02:01:41.000000000 -0500
@@ -23,6 +23,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
+#include "settings.h"
 #if ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
diff -Nurd -x'*~' aspell-0.60.5.orig/common/gettext_init.cpp aspell-0.60.5/common/gettext_init.cpp
--- aspell-0.60.5.orig/common/gettext_init.cpp	2004-11-09 03:20:24.000000000 -0500
+++ aspell-0.60.5/common/gettext_init.cpp	2008-01-31 02:05:50.000000000 -0500
@@ -16,7 +16,7 @@
     if (did_init) return;
     did_init = true;
   }
-  bindtextdomain("aspell", LOCALEDIR);
+  bindtextdomain("aspell.15", LOCALEDIR);
 }
 
 #else
diff -Nurd -x'*~' aspell-0.60.6.1.orig/interfaces/cc/aspell.h aspell-0.60.6.1/interfaces/cc/aspell.h
--- aspell-0.60.6.1.orig/interfaces/cc/aspell.h	2011-07-02 16:53:27.000000000 -0500
+++ aspell-0.60.6.1/interfaces/cc/aspell.h	2014-03-26 21:35:26.000000000 -0500
@@ -237,6 +237,7 @@
 /******************************** errors ********************************/
 
 
+#ifndef __cplusplus
 extern const struct AspellErrorInfo * const aerror_other;
 extern const struct AspellErrorInfo * const aerror_operation_not_supported;
 extern const struct AspellErrorInfo * const   aerror_cant_copy;
@@ -322,6 +323,7 @@
 extern const struct AspellErrorInfo * const   aerror_bad_magic;
 extern const struct AspellErrorInfo * const aerror_expression;
 extern const struct AspellErrorInfo * const   aerror_invalid_expression;
+#endif
 
 
 /******************************* speller *******************************/
diff -Nurd -x'*~' aspell-0.60.5.orig/po/Makevars aspell-0.60.5/po/Makevars
--- aspell-0.60.5.orig/po/Makevars	2004-01-03 07:06:24.000000000 -0500
+++ aspell-0.60.5/po/Makevars	2008-02-03 16:18:05.000000000 -0500
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
+DOMAIN = $(PACKAGE).15
 
 # These two variables depend on the location of this directory.
 subdir = po